diff options
author | Michal Schmidt <mschmidt@redhat.com> | 2014-11-28 11:58:34 +0100 |
---|---|---|
committer | Michal Schmidt <mschmidt@redhat.com> | 2014-11-28 12:04:41 +0100 |
commit | 0a1beeb64207eaa88ab9236787b1cbc2f704ae14 (patch) | |
tree | 50117277be2e2078d0373b944a30b4f09bb94443 /src/analyze/analyze-verify.c | |
parent | b4d23205f238e06aaa31264628e20669e714acad (diff) |
treewide: auto-convert the simple cases to log_*_errno()
As a followup to 086891e5c1 "log: add an "error" parameter to all
low-level logging calls and intrdouce log_error_errno() as log calls
that take error numbers", use sed to convert the simple cases to use
the new macros:
find . -name '*.[ch]' | xargs sed -r -i -e \
's/log_(debug|info|notice|warning|error|emergency)\("(.*)%s"(.*), strerror\(-([a-zA-Z_]+)\)\);/log_\1_errno(-\4, "\2%m"\3);/'
Multi-line log_*() invocations are not covered.
And we also should add log_unit_*_errno().
Diffstat (limited to 'src/analyze/analyze-verify.c')
-rw-r--r-- | src/analyze/analyze-verify.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/analyze/analyze-verify.c b/src/analyze/analyze-verify.c index f084579f1a..a0f33cbcc2 100644 --- a/src/analyze/analyze-verify.c +++ b/src/analyze/analyze-verify.c @@ -222,7 +222,7 @@ int verify_units(char **filenames, SystemdRunningAs running_as, bool check_man) /* set the path */ r = generate_path(&var, filenames); if (r < 0) { - log_error("Failed to generate unit load path: %s", strerror(-r)); + log_error_errno(-r, "Failed to generate unit load path: %m"); return r; } @@ -230,7 +230,7 @@ int verify_units(char **filenames, SystemdRunningAs running_as, bool check_man) r = manager_new(running_as, true, &m); if (r < 0) { - log_error("Failed to initalize manager: %s", strerror(-r)); + log_error_errno(-r, "Failed to initalize manager: %m"); return r; } @@ -238,7 +238,7 @@ int verify_units(char **filenames, SystemdRunningAs running_as, bool check_man) r = manager_startup(m, serial, fdset); if (r < 0) { - log_error("Failed to start manager: %s", strerror(-r)); + log_error_errno(-r, "Failed to start manager: %m"); goto finish; } @@ -260,7 +260,7 @@ int verify_units(char **filenames, SystemdRunningAs running_as, bool check_man) } else k = manager_load_unit(m, NULL, *filename, &err, &units[count]); if (k < 0) { - log_error("Failed to load %s: %s", *filename, strerror(-k)); + log_error_errno(-k, "Failed to load %s: %m", *filename); if (r == 0) r = k; } else |