sh4: r2d fix no ide/net case

[qemu.git] / keymaps.c

diff --git a/keymaps.c b/keymaps.c
index 15c40fadc1baab32309a74eb9f449f17779ede41..216e37831b6c16cb08fea191ba8150474752b1bd 100644 (file)
--- a/keymaps.c
+++ b/keymaps.c
@@ -24,7 +24,7 @@
 
 static int get_keysym(const char *name)
 {
-    name2keysym_t *p;
+    const name2keysym_t *p;
     for(p = name2keysym; p->name != NULL; p++) {
         if (!strcmp(p->name, name))
             return p->keysym;
@@ -67,11 +67,9 @@ static void add_to_key_range(struct key_range **krp, int code) {
     }
     if (kr == NULL) {
        kr = qemu_mallocz(sizeof(*kr));
-       if (kr) {
-           kr->start = kr->end = code;
-           kr->next = *krp;
-           *krp = kr;
-       }
+        kr->start = kr->end = code;
+        kr->next = *krp;
+        *krp = kr;
     }
 }
 
@@ -88,8 +86,6 @@ static kbd_layout_t *parse_keyboard_layout(const char *language,
 
     if (!k)
        k = qemu_mallocz(sizeof(kbd_layout_t));
-    if (!k)
-        return 0;
     if (!(f = fopen(file_name, "r"))) {
        fprintf(stderr,
                "Could not read keymap file: '%s'\n", file_name);