diff options
| author | Ran Benita <ran234@gmail.com> | 2012-10-16 21:09:33 +0200 |
|---|---|---|
| committer | Ran Benita <ran234@gmail.com> | 2012-10-16 21:31:25 +0200 |
| commit | 179855116d15b9da939f8fa397cd6e4399d96b39 (patch) | |
| tree | 66a5646d04b12f47c23324878e854f93637b6fee /src/keysym-utf.c | |
| parent | 7b3bd11f92f0bed76f25eab8c79c0eca21e037bc (diff) | |
| download | xorg-lib-libxkbcommon-179855116d15b9da939f8fa397cd6e4399d96b39.tar.gz | |
utils: add and use ARRAY_SIZE macro
Signed-off-by: Ran Benita <ran234@gmail.com>
Diffstat (limited to 'src/keysym-utf.c')
| -rw-r--r-- | src/keysym-utf.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/keysym-utf.c b/src/keysym-utf.c index b1f6f15..67dbb22 100644 --- a/src/keysym-utf.c +++ b/src/keysym-utf.c @@ -874,8 +874,6 @@ bin_search(const struct codepair *table, size_t length, xkb_keysym_t keysym) return 0; } -#define N_ELEMENTS(x) sizeof(x) / sizeof(x[0]) - XKB_EXPORT uint32_t xkb_keysym_to_utf32(xkb_keysym_t keysym) { @@ -894,11 +892,11 @@ xkb_keysym_to_utf32(xkb_keysym_t keysym) return keysym & 0x00ffffff; /* search smaller keypad table */ - retval = bin_search(keysymtab_kp, N_ELEMENTS(keysymtab_kp) - 1, keysym); + retval = bin_search(keysymtab_kp, ARRAY_SIZE(keysymtab_kp) - 1, keysym); /* search main table */ if (!retval) - retval = bin_search(keysymtab, N_ELEMENTS(keysymtab) - 1, keysym); + retval = bin_search(keysymtab, ARRAY_SIZE(keysymtab) - 1, keysym); return retval; } |