treewide: use log_*_errno whenever %m is in the format string

[thirdparty/systemd.git] / src / vconsole / vconsole-setup.c

diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
index 0db97f88bc159919544d5927317699593edb4060..e79ad2a5f069d4aa22667b3cf1703f2ed44185a5 100644 (file)
--- 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;
 }
@@ -123,7 +123,7 @@ static int keymap_load(const char *vc, const char *map, const char *map_toggle,
 
         pid = fork();
         if (pid < 0) {
-                log_error("Failed to fork: %m");
+                log_error_errno(errno, "Failed to fork: %m");
                 return -errno;
         } else if (pid == 0) {
                 execv(args[0], (char **) args);
@@ -161,7 +161,7 @@ static int font_load(const char *vc, const char *font, const char *map, const ch
 
         pid = fork();
         if (pid < 0) {
-                log_error("Failed to fork: %m");
+                log_error_errno(errno, "Failed to fork: %m");
                 return -errno;
         } else if (pid == 0) {
                 execv(args[0], (char **) args);
@@ -262,7 +262,7 @@ int main(int argc, char **argv) {
 
         fd = open_terminal(vc, O_RDWR|O_CLOEXEC);
         if (fd < 0) {
-                log_error("Failed to open %s: %m", vc);
+                log_error_errno(errno, "Failed to open %s: %m", vc);
                 return EXIT_FAILURE;
         }
 
@@ -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;
         }