diff options
| author | Daniel Mack <github@zonque.org> | 2015-10-01 12:16:16 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-10-01 12:16:16 +0200 |
| commit | 52dd374765ad5c8dec55db135866942830c99060 (patch) | |
| tree | 596078b6f01afc552d4257f1d133d62ac68c995e | |
| parent | 2ce8d6080d4135ae8926fc783766c3dfbeb7a6b0 (diff) | |
| parent | 46b57b6eece0ed9b67cd199af484046e50487589 (diff) | |
Merge pull request #1433 from michich/log-errno
tree-wide: add missing errno arguments to log_*_errno()
| -rw-r--r-- | src/core/smack-setup.c | 2 | ||||
| -rw-r--r-- | src/libsystemd/sd-device/sd-device.c | 8 | ||||
| -rw-r--r-- | src/udev/udev-rules.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c index 6618aa501d..761582c7a2 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 8ffe994d80..c528a157c1 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; } @@ -554,7 +554,7 @@ int device_read_uevent_file(sd_device *device) { r = handle_uevent_line(device, key, value, &major, &minor); if (r < 0) - log_debug_errno(r, "sd-device: failed to handle uevent entry '%s=%s': %s", key, value); + log_debug_errno(r, "sd-device: failed to handle uevent entry '%s=%s': %m", key, value); state = PRE_KEY; } @@ -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; @@ -1315,7 +1315,7 @@ int device_read_db_aux(sd_device *device, bool force) { db[i] = '\0'; r = handle_db_line(device, key, value); if (r < 0) - log_debug_errno(r, "sd-device: failed to handle db entry '%c:%s': %s", key, value); + log_debug_errno(r, "sd-device: failed to handle db entry '%c:%s': %m", key, value); state = PRE_KEY; } diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index e5a066aa1e..83c1793751 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -2514,7 +2514,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, rules_str(rules, rule->rule.filename_off), rule->rule.filename_line); r = sysctl_write(filename, value); if (r < 0) - log_error_errno(r, "error writing SYSCTL{%s}='%s': %s", filename, value); + log_error_errno(r, "error writing SYSCTL{%s}='%s': %m", filename, value); break; } case TK_A_RUN_BUILTIN: |