From ec2172f31b25282f8c5a3ec6dd33453cc0acd320 Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Fri, 10 Aug 2012 22:48:18 +0300 Subject: [PATCH] Combine a couple of macros Easier to see what it does without the trivial macros. Signed-off-by: Ran Benita --- src/xkb-priv.h | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/xkb-priv.h b/src/xkb-priv.h index 61ba590..9c42aeb 100644 --- a/src/xkb-priv.h +++ b/src/xkb-priv.h @@ -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 *