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/update-utmp | |
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/update-utmp')
-rw-r--r-- | src/update-utmp/update-utmp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c index 311d686a8c..a5dd8a9236 100644 --- a/src/update-utmp/update-utmp.c +++ b/src/update-utmp/update-utmp.c @@ -144,7 +144,7 @@ static int on_reboot(Context *c) { q = utmp_put_reboot(t); if (q < 0) { - log_error("Failed to write utmp record: %s", strerror(-q)); + log_error_errno(-q, "Failed to write utmp record: %m"); r = q; } @@ -170,7 +170,7 @@ static int on_shutdown(Context *c) { q = utmp_put_shutdown(); if (q < 0) { - log_error("Failed to write utmp record: %s", strerror(-q)); + log_error_errno(-q, "Failed to write utmp record: %m"); r = q; } @@ -190,7 +190,7 @@ static int on_runlevel(Context *c) { if (q < 0) { if (q != -ESRCH && q != -ENOENT) { - log_error("Failed to get current runlevel: %s", strerror(-q)); + log_error_errno(-q, "Failed to get current runlevel: %m"); return q; } @@ -225,7 +225,7 @@ static int on_runlevel(Context *c) { q = utmp_put_runlevel(runlevel, previous); if (q < 0 && q != -ESRCH && q != -ENOENT) { - log_error("Failed to write utmp record: %s", strerror(-q)); + log_error_errno(-q, "Failed to write utmp record: %m"); r = q; } @@ -265,7 +265,7 @@ int main(int argc, char *argv[]) { #endif r = bus_open_system_systemd(&c.bus); if (r < 0) { - log_error("Failed to get D-Bus connection: %s", strerror(-r)); + log_error_errno(-r, "Failed to get D-Bus connection: %m"); r = -EIO; goto finish; } |