[systemd-commits] src/vconsole

Thomas H.P. Andersen phomes at kemper.freedesktop.org
Tue Sep 30 12:35:35 PDT 2014


 src/vconsole/vconsole-setup.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 791a4fd837c713fe742d32cde1ce16f754dd30df
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date:   Tue Sep 30 21:14:58 2014 +0200

    vconsole: silence coverity
    
    Let's silence coverity here too. There is not much to do if the
    ioctls to copy the fonts and character maps should fail.

diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
index 645b1e6..0db97f8 100644
--- a/src/vconsole/vconsole-setup.c
+++ b/src/vconsole/vconsole-setup.c
@@ -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);
                 }
         }
 }



More information about the systemd-commits mailing list