xkbcomp: clean up compile_keymap function

We make the xkb_file_type enum sequential instead of masks, and then
we don't have to repeat the file types several times in the function.
Makes the code cleaner.

Signed-off-by: Ran Benita <ran234@gmail.com>

1 files changed, 11 insertions, 15 deletions

diff --git a/src/text.c b/src/text.c
index 472dbcd..ae71d3a 100644
--- a/src/text.c
+++ b/src/text.c
@@ -226,25 +226,21 @@ ModMaskText(xkb_mod_mask_t mask)
     return buf;
 }
 
+static const char *xkb_file_type_strings[_FILE_TYPE_NUM_ENTRIES] = {
+    [FILE_TYPE_KEYMAP]   = "xkb_keymap",
+    [FILE_TYPE_TYPES]    = "xkb_types",
+    [FILE_TYPE_COMPAT]   = "xkb_compatibility",
+    [FILE_TYPE_SYMBOLS]  = "xkb_symbols",
+    [FILE_TYPE_KEYCODES] = "xkb_keycodes",
+    [FILE_TYPE_RULES]    = "rules",
+};
+
 const char *
 FileTypeText(enum xkb_file_type type)
 {
-    switch (type) {
-    case FILE_TYPE_KEYMAP:
-        return "xkb_keymap";
-    case FILE_TYPE_TYPES:
-        return "xkb_types";
-    case FILE_TYPE_COMPAT:
-        return "xkb_compatability";
-    case FILE_TYPE_SYMBOLS:
-        return "xkb_symbols";
-    case FILE_TYPE_KEYCODES:
-        return "xkb_keycodes";
-    case FILE_TYPE_RULES:
-        return "rules";
-    default:
+    if (type > _FILE_TYPE_NUM_ENTRIES)
         return "unknown";
-    }
+    return xkb_file_type_strings[type];
 }
 
 static const char *actionTypeNames[XkbSA_NumActions] = {