From 4846ad16579f7fcf06fe01e03a56815b2d8c4a93 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Wed, 7 Jan 2009 22:52:33 +0000
Subject: Introduce nitems() and use it; use bsearch.

---
 input-keys.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'input-keys.c')

diff --git a/input-keys.c b/input-keys.c
index 69e0f859..cc7e8f8f 100644
--- a/input-keys.c
+++ b/input-keys.c
@@ -1,4 +1,4 @@
-/* $Id: input-keys.c,v 1.15 2008-12-22 17:26:51 nicm Exp $ */
+/* $Id: input-keys.c,v 1.16 2009-01-07 22:52:33 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -94,7 +94,6 @@ struct {
 	{ KEYC_KP4_0,  "\033Op", 0 },
 	{ KEYC_KP4_2,  "\033On", 0 },
 };
-#define NINPUTKEYS (sizeof input_keys / sizeof input_keys[0])
 
 /* Translate a key code from client into an output key sequence. */
 void
@@ -114,7 +113,7 @@ input_key(struct window *w, int key)
 		return;
 	}
 
-	for (i = 0; i < NINPUTKEYS; i++) {
+	for (i = 0; i < nitems(input_keys); i++) {
 		if ((input_keys[i].flags & INPUTKEY_KEYPAD) &&
 		    !(w->screen->mode & MODE_KKEYPAD))
 			continue;
@@ -124,7 +123,7 @@ input_key(struct window *w, int key)
 		if (input_keys[i].key == key)
 			break;
 	}
-	if (i == NINPUTKEYS) {
+	if (i == nitems(input_keys)) {
 		log_debug2("key 0x%x missing", key);
 		return;
 	}
-- 
cgit v1.2.3