shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-22 22:03:43 +03:00
Code

Merge pull request #1433 from michich/log-errno

Browse Source 
tree-wide: add missing errno arguments to log_*_errno()
This commit is contained in:
Daniel Mack 2015-10-01 12:16:16 +02:00
commit 52dd374765
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/smack-setup.c
View File

@ -222,7 +222,7 @@ int mac_smack_setup(bool *loaded_policy) {
#ifdef SMACK_RUN_LABEL #ifdef SMACK_RUN_LABEL
r = write_string_file("/proc/self/attr/current", SMACK_RUN_LABEL, 0); r = write_string_file("/proc/self/attr/current", SMACK_RUN_LABEL, 0);
if (r) 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 #endif
r = write_cipso2_rules("/etc/smack/cipso.d/"); r = write_cipso2_rules("/etc/smack/cipso.d/");

8
src/libsystemd/sd-device/sd-device.c
View File

@ -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); return log_debug_errno(errno, "sd-device: could not canonicalize '%s': %m", _syspath);
} }
} else if (r < 0) { } 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; return r;
} }
@ -554,7 +554,7 @@ int device_read_uevent_file(sd_device *device) {
r = handle_uevent_line(device, key, value, &major, &minor); r = handle_uevent_line(device, key, value, &major, &minor);
if (r < 0) 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; state = PRE_KEY;
} }
@ -568,7 +568,7 @@ int device_read_uevent_file(sd_device *device) {
if (major) { if (major) {
r = device_set_devnum(device, major, minor); r = device_set_devnum(device, major, minor);
if (r < 0) 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; return 0;
@ -1315,7 +1315,7 @@ int device_read_db_aux(sd_device *device, bool force) {
db[i] = '\0'; db[i] = '\0';
r = handle_db_line(device, key, value); r = handle_db_line(device, key, value);
if (r < 0) 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; state = PRE_KEY;
} }

2
src/udev/udev-rules.c
View File

@ -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); rules_str(rules, rule->rule.filename_off), rule->rule.filename_line);
r = sysctl_write(filename, value); r = sysctl_write(filename, value);
if (r < 0) 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; break;
} }
case TK_A_RUN_BUILTIN: case TK_A_RUN_BUILTIN: