merge udev/, libudev/, systemd/ files in src/; move extras/ to src/

[elogind.git] / src / extras / keymap / keymap.c

diff --git a/extras/keymap/keymap.c b/src/extras/keymap/keymap.c
similarity index 98%
rename from extras/keymap/keymap.c
rename to src/extras/keymap/keymap.c
index 79fd0599a928d482e3572bd978878a5c4aeacfb4..6bcfaefa1829f7f20c3edc08f908236d0358d697 100644 (file)
--- a/extras/keymap/keymap.c
+++ b/src/extras/keymap/keymap.c
@@ -177,10 +177,10 @@ static void set_key(int fd, const char* scancode_str, const char* keyname)
        }
 
        if (evdev_set_keycode(fd, scancode, k->id) < 0)
-               fprintf(stderr, "setting scancode 0x%2X to key code %i failed\n", 
+               fprintf(stderr, "setting scancode 0x%2X to key code %i failed\n",
                        scancode, k->id);
        else
-               printf("setting scancode 0x%2X to key code %i\n", 
+               printf("setting scancode 0x%2X to key code %i\n",
                        scancode, k->id);
 }
 
@@ -324,7 +324,7 @@ static void interactive(int fd)
                                has_scan = 0;
                        }
 
-                       last_key = ev.code;
+                       last_key = ev.code;
                        has_key = 1 + ev.value;
                        /*printf("--- got key %hu; has scan %i key %i\n", last_key, has_scan, has_key);*/
 
@@ -437,7 +437,7 @@ int main(int argc, char **argv)
        /* more arguments (device, scancode/keyname pairs): set keys directly */
        if ((argc - optind - 1) % 2 == 0) {
                for (i = optind+1; i < argc; i += 2)
-                       set_key(fd, argv[i], argv[i+1]);        
+                       set_key(fd, argv[i], argv[i+1]);
                return 0;
        }