Tar, by itself, could fail.

[oweals/busybox.git] / dumpkmap.c

diff --git a/dumpkmap.c b/dumpkmap.c
index 13b7d8937f82eb4d2c901ef39847d44529ed5148..b438ba2713333802e6f83e9c02400f2d274991de 100644 (file)
--- a/dumpkmap.c
+++ b/dumpkmap.c
@@ -20,7 +20,7 @@
  *
  */
 
-#include "internal.h"
+#include "busybox.h"
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -32,11 +32,11 @@ struct kbentry {
        unsigned char kb_index;
        unsigned short kb_value;
 };
-#define KDGKBENT        0x4B46  /* gets one entry in translation table */
+static const int KDGKBENT = 0x4B46;  /* gets one entry in translation table */
 
 /* From <linux/keyboard.h> */
-#define NR_KEYS         128
-#define MAX_NR_KEYMAPS  256
+static const int NR_KEYS = 128;
+static const int MAX_NR_KEYMAPS = 256;
 
 int dumpkmap_main(int argc, char **argv)
 {
@@ -50,8 +50,8 @@ int dumpkmap_main(int argc, char **argv)
 
        fd = open("/dev/tty0", O_RDWR);
        if (fd < 0) {
-               errorMsg("Error opening /dev/tty0: %s\n", strerror(errno));
-               return 1;
+               perror_msg("Error opening /dev/tty0");
+               return EXIT_FAILURE;
        }
 
        write(1, magic, 7);
@@ -78,7 +78,7 @@ int dumpkmap_main(int argc, char **argv)
                                ke.kb_table = i;
                                if (ioctl(fd, KDGKBENT, &ke) < 0) {
                                
-                                       errorMsg("ioctl returned: %s, %s, %s, %xqq\n",strerror(errno),(char *)&ke.kb_index,(char *)&ke.kb_table,(int)&ke.kb_value);
+                                       error_msg("ioctl returned: %s, %s, %s, %xqq\n",strerror(errno),(char *)&ke.kb_index,(char *)&ke.kb_table,(int)&ke.kb_value);
                                        }
                                else {
                                        write(1,(void*)&ke.kb_value,2); 
@@ -88,5 +88,5 @@ int dumpkmap_main(int argc, char **argv)
                }
        }
        close(fd);
-       return 0;
+       return EXIT_SUCCESS;
 }