From 4846ad16579f7fcf06fe01e03a56815b2d8c4a93 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Wed, 7 Jan 2009 22:52:33 +0000 Subject: Introduce nitems() and use it; use bsearch. --- mode-key.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'mode-key.c') diff --git a/mode-key.c b/mode-key.c index d8412ba9..f33202a8 100644 --- a/mode-key.c +++ b/mode-key.c @@ -1,4 +1,4 @@ -/* $Id: mode-key.c,v 1.3 2008-07-03 15:26:32 nicm Exp $ */ +/* $Id: mode-key.c,v 1.4 2009-01-07 22:52:33 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott @@ -48,7 +48,6 @@ const struct mode_key_entry mode_key_table_vi[] = { { MODEKEY_UP, 'k' }, { MODEKEY_UP, KEYC_UP }, }; -#define NKEYVI (sizeof mode_key_table_vi / sizeof mode_key_table_vi[0]) const struct mode_key_entry mode_key_table_emacs[] = { { MODEKEY_BOL, '\001' }, @@ -70,7 +69,6 @@ const struct mode_key_entry mode_key_table_emacs[] = { { MODEKEY_STARTSEL, '\000' }, { MODEKEY_UP, KEYC_UP }, }; -#define NKEYEMACS (sizeof mode_key_table_emacs / sizeof mode_key_table_emacs[0]) enum mode_key mode_key_lookup(int table, int key) @@ -80,10 +78,10 @@ mode_key_lookup(int table, int key) if (table == MODEKEY_EMACS) { ptr = mode_key_table_emacs; - n = NKEYEMACS; + n = nitems(mode_key_table_emacs); } else if (table == MODEKEY_VI) { ptr = mode_key_table_vi; - n = NKEYVI; + n = nitems(mode_key_table_vi); } else return (MODEKEY_NONE); -- cgit