Combine a couple of macros
authorRan Benita <ran234@gmail.com>
Fri, 10 Aug 2012 19:48:18 +0000 (22:48 +0300)
committerRan Benita <ran234@gmail.com>
Fri, 10 Aug 2012 19:49:46 +0000 (22:49 +0300)
Easier to see what it does without the trivial macros.

Signed-off-by: Ran Benita <ran234@gmail.com>
src/xkb-priv.h

index 61ba5902d33a630e5374cef55f10936565cab3b5..9c42aeb2e59eb77a81c3de581decb7b8db2180fd 100644 (file)
@@ -417,24 +417,12 @@ XkbKeyNumSyms(struct xkb_key *key, xkb_group_index_t group,
     return key->num_syms[group * key->width + level];
 }
 
-static inline xkb_keysym_t *
-XkbKeySym(struct xkb_key *key, int ndx)
-{
-    return &darray_item(key->syms, ndx);
-}
-
-static inline int
-XkbKeySymOffset(struct xkb_key *key, xkb_group_index_t group,
-                xkb_level_index_t level)
-{
-    return key->sym_index[group * key->width + level];
-}
-
 static inline xkb_keysym_t *
 XkbKeySymEntry(struct xkb_key *key, xkb_group_index_t group,
                xkb_level_index_t level)
 {
-    return XkbKeySym(key, XkbKeySymOffset(key, group, level));
+    return &darray_item(key->syms,
+                        key->sym_index[group * key->width + level]);
 }
 
 static inline union xkb_action *