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().

2 files changed, 21 insertions, 21 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;
         }
 
diff --git a/src/locale/localed.c b/src/locale/localed.c
index 7fe73247d4..2a293a7bc0 100644
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -375,7 +375,7 @@ static int locale_update_system_manager(Context *c, sd_bus *bus) {
 
         r = sd_bus_call(bus, m, 0, &error, NULL);
         if (r < 0)
-                log_error("Failed to update the manager environment: %s", strerror(-r));
+                log_error_errno(-r, "Failed to update the manager environment: %m");
 
         return 0;
 }
@@ -611,7 +611,7 @@ static int vconsole_convert_to_x11(Context *c, sd_bus *bus) {
 
                 r = x11_write_data(c);
                 if (r < 0) {
-                        log_error("Failed to set X11 keyboard layout: %s", strerror(-r));
+                        log_error_errno(-r, "Failed to set X11 keyboard layout: %m");
                         return r;
                 }
 
@@ -790,7 +790,7 @@ static int x11_convert_to_vconsole(Context *c, sd_bus *bus) {
         if (modified) {
                 r = vconsole_write_data(c);
                 if (r < 0)
-                        log_error("Failed to set virtual console keymap: %s", strerror(-r));
+                        log_error_errno(-r, "Failed to set virtual console keymap: %m");
 
                 log_info("Changed virtual console keymap to '%s' toggle '%s'",
                          strempty(c->vc_keymap), strempty(c->vc_keymap_toggle));
@@ -923,7 +923,7 @@ static int method_set_locale(sd_bus *bus, sd_bus_message *m, void *userdata, sd_
 
                 r = locale_write_data(c, &settings);
                 if (r < 0) {
-                        log_error("Failed to set locale: %s", strerror(-r));
+                        log_error_errno(-r, "Failed to set locale: %m");
                         return sd_bus_error_set_errnof(error, r, "Failed to set locale: %s", strerror(-r));
                 }
 
@@ -983,7 +983,7 @@ static int method_set_vc_keyboard(sd_bus *bus, sd_bus_message *m, void *userdata
 
                 r = vconsole_write_data(c);
                 if (r < 0) {
-                        log_error("Failed to set virtual console keymap: %s", strerror(-r));
+                        log_error_errno(-r, "Failed to set virtual console keymap: %m");
                         return sd_bus_error_set_errnof(error, r, "Failed to set virtual console keymap: %s", strerror(-r));
                 }
 
@@ -992,7 +992,7 @@ static int method_set_vc_keyboard(sd_bus *bus, sd_bus_message *m, void *userdata
 
                 r = vconsole_reload(bus);
                 if (r < 0)
-                        log_error("Failed to request keymap reload: %s", strerror(-r));
+                        log_error_errno(-r, "Failed to request keymap reload: %m");
 
                 sd_bus_emit_properties_changed(bus,
                                 "/org/freedesktop/locale1",
@@ -1002,7 +1002,7 @@ static int method_set_vc_keyboard(sd_bus *bus, sd_bus_message *m, void *userdata
                 if (convert) {
                         r = vconsole_convert_to_x11(c, bus);
                         if (r < 0)
-                                log_error("Failed to convert keymap data: %s", strerror(-r));
+                                log_error_errno(-r, "Failed to convert keymap data: %m");
                 }
         }
 
@@ -1106,7 +1106,7 @@ static int method_set_x11_keyboard(sd_bus *bus, sd_bus_message *m, void *userdat
 
                 r = x11_write_data(c);
                 if (r < 0) {
-                        log_error("Failed to set X11 keyboard layout: %s", strerror(-r));
+                        log_error_errno(-r, "Failed to set X11 keyboard layout: %m");
                         return sd_bus_error_set_errnof(error, r, "Failed to set X11 keyboard layout: %s", strerror(-r));
                 }
 
@@ -1124,7 +1124,7 @@ static int method_set_x11_keyboard(sd_bus *bus, sd_bus_message *m, void *userdat
                 if (convert) {
                         r = x11_convert_to_vconsole(c, bus);
                         if (r < 0)
-                                log_error("Failed to convert keymap data: %s", strerror(-r));
+                                log_error_errno(-r, "Failed to convert keymap data: %m");
                 }
         }
 
@@ -1156,25 +1156,25 @@ static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) {
 
         r = sd_bus_default_system(&bus);
         if (r < 0) {
-                log_error("Failed to get system bus connection: %s", strerror(-r));
+                log_error_errno(-r, "Failed to get system bus connection: %m");
                 return r;
         }
 
         r = sd_bus_add_object_vtable(bus, NULL, "/org/freedesktop/locale1", "org.freedesktop.locale1", locale_vtable, c);
         if (r < 0) {
-                log_error("Failed to register object: %s", strerror(-r));
+                log_error_errno(-r, "Failed to register object: %m");
                 return r;
         }
 
         r = sd_bus_request_name(bus, "org.freedesktop.locale1", 0);
         if (r < 0) {
-                log_error("Failed to register name: %s", strerror(-r));
+                log_error_errno(-r, "Failed to register name: %m");
                 return r;
         }
 
         r = sd_bus_attach_event(bus, event, 0);
         if (r < 0) {
-                log_error("Failed to attach bus to event loop: %s", strerror(-r));
+                log_error_errno(-r, "Failed to attach bus to event loop: %m");
                 return r;
         }
 
@@ -1205,7 +1205,7 @@ int main(int argc, char *argv[]) {
 
         r = sd_event_default(&event);
         if (r < 0) {
-                log_error("Failed to allocate event loop: %s", strerror(-r));
+                log_error_errno(-r, "Failed to allocate event loop: %m");
                 goto finish;
         }
 
@@ -1217,13 +1217,13 @@ int main(int argc, char *argv[]) {
 
         r = context_read_data(&context);
         if (r < 0) {
-                log_error("Failed to read locale data: %s", strerror(-r));
+                log_error_errno(-r, "Failed to read locale data: %m");
                 goto finish;
         }
 
         r = bus_event_loop_with_idle(event, bus, "org.freedesktop.locale1", DEFAULT_EXIT_USEC, NULL, NULL);
         if (r < 0) {
-                log_error("Failed to run event loop: %s", strerror(-r));
+                log_error_errno(-r, "Failed to run event loop: %m");
                 goto finish;
         }