X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fkeymap%2Fkeymap.c;h=6dc9c2d200b7ab9245217b9bc35029146a641dc6;hb=45b51b6b71c9de2067dc42c689879bb051517ccb;hp=5cbce86db1b0f9f3cf8ce5cadbcbbf0f73448cfc;hpb=d8f173fd2ee9ee60affa1a4d1a89f2501977fb0b;p=elogind.git

diff --git a/src/udev/keymap/keymap.c b/src/udev/keymap/keymap.c
index 5cbce86db..6dc9c2d20 100644
--- a/src/udev/keymap/keymap.c
+++ b/src/udev/keymap/keymap.c
@@ -40,6 +40,7 @@ const struct key* lookup_key (const char *str, unsigned int len);
 
 #include "keys-from-name.h"
 #include "keys-to-name.h"
+#include "macro.h"
 #include "util.h"
 
 #define MAX_SCANCODES 1024
@@ -346,7 +347,7 @@ static void interactive(int fd)
         ioctl(fd, EVIOCGRAB, 0);
 }
 
-static void help(int error)
+_noreturn_ static void help(int error)
 {
         const char* h = "Usage: keymap <event device> [<map file>]\n"
                         "       keymap <event device> scancode keyname [...]\n"
@@ -362,13 +363,8 @@ static void help(int error)
 
 int main(int argc, char **argv)
 {
-        enum {
-                ARG_VERSION = 0x100,
-        };
-
         static const struct option options[] = {
                 { "help", no_argument, NULL, 'h' },
-                { "version", no_argument, NULL, ARG_VERSION },
                 { "interactive", no_argument, NULL, 'i' },
                 {}
         };
@@ -387,10 +383,6 @@ int main(int argc, char **argv)
                 case 'h':
                         help(0);
 
-                case ARG_VERSION:
-                        puts(PACKAGE_STRING);
-                        exit(0);
-
                 case 'i':
                         opt_interactive = 1;
                         break;