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/shared/util.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/shared/util.c')
-rw-r--r-- | src/shared/util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/shared/util.c b/src/shared/util.c index d3eec5f87..11be757c2 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -2214,7 +2214,7 @@ int acquire_terminal( r = reset_terminal_fd(fd, true); if (r < 0) - log_warning("Failed to reset terminal: %s", strerror(-r)); + log_warning_errno(-r, "Failed to reset terminal: %m"); return fd; @@ -3796,7 +3796,7 @@ int wait_for_terminate_and_warn(const char *name, pid_t pid) { r = wait_for_terminate(pid, &status); if (r < 0) { - log_warning("Failed to wait for %s: %s", name, strerror(-r)); + log_warning_errno(-r, "Failed to wait for %s: %m", name); return r; } @@ -5507,13 +5507,13 @@ int make_console_stdio(void) { fd = acquire_terminal("/dev/console", false, true, true, USEC_INFINITY); if (fd < 0) { - log_error("Failed to acquire terminal: %s", strerror(-fd)); + log_error_errno(-fd, "Failed to acquire terminal: %m"); return fd; } r = make_stdio(fd); if (r < 0) { - log_error("Failed to duplicate terminal fd: %s", strerror(-r)); + log_error_errno(-r, "Failed to duplicate terminal fd: %m"); return r; } |