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/vconsole | |
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/vconsole')
-rw-r--r-- | src/vconsole/vconsole-setup.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c index 0db97f88bc..e2ba8a0138 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c @@ -62,7 +62,7 @@ static int disable_utf8(int fd) { r = k; if (r < 0) - log_warning("Failed to disable UTF-8: %s", strerror(-r)); + log_warning_errno(-r, "Failed to disable UTF-8: %m"); return r; } @@ -94,7 +94,7 @@ static int enable_utf8(int fd) { r = k; if (r < 0) - log_warning("Failed to enable UTF-8: %s", strerror(-r)); + log_warning_errno(-r, "Failed to enable UTF-8: %m"); return r; } @@ -282,7 +282,7 @@ int main(int argc, char **argv) { NULL); if (r < 0 && r != -ENOENT) - log_warning("Failed to read /etc/vconsole.conf: %s", strerror(-r)); + log_warning_errno(-r, "Failed to read /etc/vconsole.conf: %m"); /* Let the kernel command line override /etc/vconsole.conf */ if (detect_container(NULL) <= 0) { @@ -295,7 +295,7 @@ int main(int argc, char **argv) { NULL); if (r < 0 && r != -ENOENT) - log_warning("Failed to read /proc/cmdline: %s", strerror(-r)); + log_warning_errno(-r, "Failed to read /proc/cmdline: %m"); } if (utf8) @@ -305,7 +305,7 @@ int main(int argc, char **argv) { r = font_load(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid); if (r < 0) { - log_error("Failed to start " KBD_SETFONT ": %s", strerror(-r)); + log_error_errno(-r, "Failed to start " KBD_SETFONT ": %m"); return EXIT_FAILURE; } @@ -314,7 +314,7 @@ int main(int argc, char **argv) { r = keymap_load(vc, vc_keymap, vc_keymap_toggle, utf8, &keymap_pid); if (r < 0) { - log_error("Failed to start " KBD_LOADKEYS ": %s", strerror(-r)); + log_error_errno(-r, "Failed to start " KBD_LOADKEYS ": %m"); return EXIT_FAILURE; } |