dump: use KeyNameText instead of copying
authorRan Benita <ran234@gmail.com>
Thu, 12 Jul 2012 14:54:09 +0000 (17:54 +0300)
committerDaniel Stone <daniel@fooishbar.org>
Thu, 12 Jul 2012 17:07:56 +0000 (18:07 +0100)
Signed-off-by: Ran Benita <ran234@gmail.com>
src/keymap-dump.c

index faa8d43..d0f8ef6 100644 (file)
@@ -877,7 +877,6 @@ write_symbols(struct xkb_keymap *keymap, char **buf, size_t *size,
     if (map && map->modmap) {
        for (key = keymap->min_key_code; key <= keymap->max_key_code; key++) {
             int mod;
-            char name[5];
 
             if (map->modmap[key] == 0)
                 continue;
@@ -886,12 +885,11 @@ write_symbols(struct xkb_keymap *keymap, char **buf, size_t *size,
                 if (!(map->modmap[key] & (1 << mod)))
                     continue;
 
-                memcpy(name, darray_item(keymap->names->keys, key).name, 4);
-                name[4]= '\0';
-
                 write_buf(keymap, buf, size, offset,
-                          "\t\tmodifier_map %s { <%s> };\n",
-                          get_mod_index_text(mod), name);
+                          "\t\tmodifier_map %s { %s };\n",
+                          get_mod_index_text(mod),
+                          XkbcKeyNameText(darray_item(keymap->names->keys,
+                                                      key).name));
             }
        }
     }