[PATCH weston] clients: Use ARRAY_LENGTH macro in weston-simple-im
Bryce Harrington
bryce at osg.samsung.com
Wed Aug 31 01:38:27 UTC 2016
Signed-off-by: Bryce Harrington <bryce at osg.samsung.com>
---
clients/weston-simple-im.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/clients/weston-simple-im.c b/clients/weston-simple-im.c
index 2d23930..1663d84 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) {
--
1.9.1
More information about the wayland-devel
mailing list