diff options
| author | Bryce Harrington <bryce@osg.samsung.com> | 2016-08-30 18:38:27 -0700 |
|---|---|---|
| committer | Quentin Glidic <sardemff7+git@sardemff7.net> | 2016-09-01 00:47:18 +0200 |
| commit | c6ae8126e1d0b83b76b272f02ef7a4319336c116 (patch) | |
| tree | 7896e11433daf217142f7b5fe14db39e63786eb3 /clients | |
| parent | b0e4abd215bc30cf53c17a23394820ffa2214240 (diff) | |
clients: Use ARRAY_LENGTH macro in weston-simple-im
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Yong Bakos <ybakos@humanoriented.com>
Diffstat (limited to 'clients')
| -rw-r--r-- | clients/weston-simple-im.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clients/weston-simple-im.c b/clients/weston-simple-im.c index 2d239300..1663d84f 100644 --- a/clients/weston-simple-im.c +++ b/clients/weston-simple-im.c @@ -30,11 +30,11 @@ #include <unistd.h> #include <sys/mman.h> - #include <linux/input.h> #include "window.h" #include "input-method-unstable-v1-client-protocol.h" +#include "shared/helpers.h" enum compose_state { state_normal, @@ -398,7 +398,7 @@ simple_im_key_handler(struct simple_im *keyboard, if (state == WL_KEYBOARD_KEY_STATE_PRESSED) return; - for (i = 0; i < sizeof(ignore_keys_on_compose) / sizeof(ignore_keys_on_compose[0]); i++) { + for (i = 0; i < ARRAY_LENGTH(ignore_keys_on_compose); i++) { if (sym == ignore_keys_on_compose[i]) { zwp_input_method_context_v1_key(context, keyboard->serial, @@ -414,7 +414,7 @@ simple_im_key_handler(struct simple_im *keyboard, keyboard->compose_seq.keys[i] = sym; cs = bsearch (&keyboard->compose_seq, compose_seqs, - sizeof(compose_seqs) / sizeof(compose_seqs[0]), + ARRAY_LENGTH(compose_seqs), sizeof(compose_seqs[0]), compare_compose_keys); if (cs) { |