From: Michal Schmidt Date: Thu, 1 Oct 2015 09:04:08 +0000 (+0200) Subject: tree-wide: add missing errno arguments to log_*_errno() X-Git-Tag: v227~43^2~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=23446f01480e1d6f72a03d71f9c67cbf34ddaf3b;p=thirdparty%2Fsystemd.git tree-wide: add missing errno arguments to log_*_errno() A few of the recent conversions to log_*_errno() were missing the errno value arguments. Fixes: e53fc357a9b "tree-wide: remove a number of invocations of strerror() and replace by %m" --- diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c index 6618aa501d6..761582c7a2d 100644 --- a/src/core/smack-setup.c +++ b/src/core/smack-setup.c @@ -222,7 +222,7 @@ int mac_smack_setup(bool *loaded_policy) { #ifdef SMACK_RUN_LABEL r = write_string_file("/proc/self/attr/current", SMACK_RUN_LABEL, 0); if (r) - log_warning_errno("Failed to set SMACK label \"%s\" on self: %m", SMACK_RUN_LABEL); + log_warning_errno(r, "Failed to set SMACK label \"%s\" on self: %m", SMACK_RUN_LABEL); #endif r = write_cipso2_rules("/etc/smack/cipso.d/"); diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c index 8ffe994d808..ca231858c03 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c @@ -172,7 +172,7 @@ int device_set_syspath(sd_device *device, const char *_syspath, bool verify) { return log_debug_errno(errno, "sd-device: could not canonicalize '%s': %m", _syspath); } } else if (r < 0) { - log_debug_errno("sd-device: could not get target of '%s': %m", _syspath); + log_debug_errno(r, "sd-device: could not get target of '%s': %m", _syspath); return r; } @@ -568,7 +568,7 @@ int device_read_uevent_file(sd_device *device) { if (major) { r = device_set_devnum(device, major, minor); if (r < 0) - log_debug_errno("sd-device: could not set 'MAJOR=%s' or 'MINOR=%s' from '%s': %m", major, minor, path); + log_debug_errno(r, "sd-device: could not set 'MAJOR=%s' or 'MINOR=%s' from '%s': %m", major, minor, path); } return 0;