diff options
author | Michal Schmidt <mschmidt@redhat.com> | 2014-11-28 17:09:20 +0100 |
---|---|---|
committer | Michal Schmidt <mschmidt@redhat.com> | 2014-11-28 17:17:51 +0100 |
commit | c33b329709ebe2755181980a050d02ec7c81ed87 (patch) | |
tree | 39080c428c72c90daddbe1c08d45c181adf1476c /src/shared | |
parent | 5567fafbc9d83a1391f23ecdbe698a3c03929370 (diff) |
treewide: more log_*_errno() conversions, multiline calls
Basically:
find . -name '*.[ch]' | while read f; do perl -i.mmm -e \
'local $/;
local $_=<>;
s/log_(debug|info|notice|warning|error|emergency)\("([^"]*)%s"([^;]*),\s*strerror\(-?([->a-zA-Z_]+)\)\);/log_\1_errno(\4, "\2%m"\3);/gms;print;' \
$f; done
Plus manual indentation fixups.
Diffstat (limited to 'src/shared')
-rw-r--r-- | src/shared/conf-files.c | 4 | ||||
-rw-r--r-- | src/shared/conf-parser.c | 4 | ||||
-rw-r--r-- | src/shared/logs-show.c | 3 | ||||
-rw-r--r-- | src/shared/sleep-config.c | 4 |
4 files changed, 7 insertions, 8 deletions
diff --git a/src/shared/conf-files.c b/src/shared/conf-files.c index e6ee97a978..51f4e0105c 100644 --- a/src/shared/conf-files.c +++ b/src/shared/conf-files.c @@ -118,8 +118,8 @@ static int conf_files_list_strv_internal(char ***strv, const char *suffix, const if (r == -ENOMEM) { return r; } else if (r < 0) - log_debug("Failed to search for files in %s: %s", - *p, strerror(-r)); + log_debug_errno(r, "Failed to search for files in %s: %m", + *p); } files = hashmap_get_strv(fh); diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c index f9a3459caa..94808fa6ce 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c @@ -428,8 +428,8 @@ int config_parse(const char *unit, if (r < 0) { if (warn) - log_warning("Failed to parse file '%s': %s", - filename, strerror(-r)); + log_warning_errno(r, "Failed to parse file '%s': %m", + filename); return r; } } diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c index eb15eeac88..16ea1bb782 100644 --- a/src/shared/logs-show.c +++ b/src/shared/logs-show.c @@ -426,8 +426,7 @@ static int output_verbose( else { r = safe_atou64(value, &realtime); if (r < 0) - log_debug("Failed to parse realtime timestamp: %s", - strerror(-r)); + log_debug_errno(r, "Failed to parse realtime timestamp: %m"); } } diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c index e6157f0e94..0fd307d0b0 100644 --- a/src/shared/sleep-config.c +++ b/src/shared/sleep-config.c @@ -233,8 +233,8 @@ static bool enough_memory_for_hibernation(void) { r = safe_atollu(active, &act); if (r < 0) { - log_error("Failed to parse Active(anon) from /proc/meminfo: %s: %s", - active, strerror(-r)); + log_error_errno(r, "Failed to parse Active(anon) from /proc/meminfo: %s: %m", + active); return false; } |