treewide: auto-convert the simple cases to log_*_errno()

[elogind.git] / src / vconsole / vconsole-setup.c

diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
index 645b1e69940a9f4b72e723f20dc8d4040c97b60d..e2ba8a0138607d1d4a17db5b7e0c2b505fff1643 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;
 }
@@ -212,15 +212,15 @@ static void font_copy_to_all_vcs(int fd) {
                 /* copy font from active VT, where the font was uploaded to */
                 cfo.op = KD_FONT_OP_COPY;
                 cfo.height = vcs.v_active-1; /* tty1 == index 0 */
-                ioctl(vcfd, KDFONTOP, &cfo);
+                (void) ioctl(vcfd, KDFONTOP, &cfo);
 
                 /* copy map of 8bit chars */
                 if (ioctl(fd, GIO_SCRNMAP, map8) >= 0)
-                    ioctl(vcfd, PIO_SCRNMAP, map8);
+                    (void) ioctl(vcfd, PIO_SCRNMAP, map8);
 
                 /* copy map of 8bit chars -> 16bit Unicode values */
                 if (ioctl(fd, GIO_UNISCRNMAP, map16) >= 0)
-                    ioctl(vcfd, PIO_UNISCRNMAP, map16);
+                    (void) ioctl(vcfd, PIO_UNISCRNMAP, map16);
 
                 /* copy unicode translation table */
                 /* unimapd is a ushort count and a pointer to an
@@ -230,8 +230,8 @@ static void font_copy_to_all_vcs(int fd) {
                 if (ioctl(fd, GIO_UNIMAP, &unimapd) >= 0) {
                         struct unimapinit adv = { 0, 0, 0 };
 
-                        ioctl(vcfd, PIO_UNIMAPCLR, &adv);
-                        ioctl(vcfd, PIO_UNIMAP, &unimapd);
+                        (void) ioctl(vcfd, PIO_UNIMAPCLR, &adv);
+                        (void) ioctl(vcfd, PIO_UNIMAP, &unimapd);
                 }
         }
 }
@@ -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;
         }