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/locale/localectl.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/locale/localectl.c')
-rw-r--r-- | src/locale/localectl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/locale/localectl.c b/src/locale/localectl.c index d4a2d29aea..70f3b56558 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c @@ -110,7 +110,7 @@ static void print_overriden_variables(void) { 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"); goto finish; } @@ -178,7 +178,7 @@ static int show_status(sd_bus *bus, char **args, unsigned n) { map, &info); if (r < 0) { - log_error("Could not get properties: %s", strerror(-r)); + log_error_errno(-r, "Could not get properties: %m"); goto fail; } @@ -235,7 +235,7 @@ static int list_locales(sd_bus *bus, char **args, unsigned n) { r = get_locales(&l); if (r < 0) { - log_error("Failed to read list of locales: %s", strerror(-r)); + log_error_errno(-r, "Failed to read list of locales: %m"); return r; } @@ -310,7 +310,7 @@ static int nftw_cb( r = set_consume(keymaps, p); if (r < 0 && r != -EEXIST) { - log_error("Can't add keymap: %s", strerror(-r)); + log_error_errno(-r, "Can't add keymap: %m"); return r; } @@ -683,7 +683,7 @@ int main(int argc, char*argv[]) { r = bus_open_transport(arg_transport, arg_host, false, &bus); if (r < 0) { - log_error("Failed to create bus connection: %s", strerror(-r)); + log_error_errno(-r, "Failed to create bus connection: %m"); goto finish; } |