X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fudev%2Fkeymap%2Fkeymap.c;h=a2e43f92c02a12798d619d5efbbe66efe9574e59;hp=4c30ccf314318c793a887e6d9a2121a9493cb4f2;hb=33502ffe2eb7b56cdd018a4fb6830d7828519fad;hpb=3e2147858f21943d5f4a781c60f33ac22c6096ed

diff --git a/src/udev/keymap/keymap.c b/src/udev/keymap/keymap.c
index 4c30ccf31..a2e43f92c 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 "util.h"
 
 #define MAX_SCANCODES 1024
 
@@ -48,7 +49,7 @@ static int evdev_open(const char *dev)
         int fd;
         char fn[PATH_MAX];
 
-        if (strncmp(dev, "/dev", 4) != 0) {
+        if (!startswith(dev, "/dev")) {
                 snprintf(fn, sizeof(fn), "/dev/%s", dev);
                 dev = fn;
         }
@@ -418,8 +419,9 @@ int main(int argc, char **argv)
                         /* Keymap file argument is a filename */
                         /* Open override file if present, otherwise default file */
                         char keymap_path[PATH_MAX];
+                        FILE *f;
                         snprintf(keymap_path, sizeof(keymap_path), "%s%s", SYSCONFDIR "/udev/keymaps/", filearg);
-                        FILE *f = fopen(keymap_path, "r");
+                        f = fopen(keymap_path, "r");
                         if (f) {
                                 merge_table(fd, f);
                         } else {