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. --- tty-keys.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tty-keys.c') diff --git a/tty-keys.c b/tty-keys.c index 87c26cb4..ca96300d 100644 --- a/tty-keys.c +++ b/tty-keys.c @@ -1,4 +1,4 @@ -/* $Id: tty-keys.c,v 1.11 2008-09-26 06:45:28 nicm Exp $ */ +/* $Id: tty-keys.c,v 1.12 2009-01-07 22:52:33 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -205,7 +205,6 @@ struct { { "-\033Op", KEYC_KP4_0 }, { "-\033On", KEYC_KP4_2 }, }; -#define NTTYKEYS (sizeof tty_keys / sizeof tty_keys[0]) RB_GENERATE(tty_keys, tty_key, entry, tty_keys_cmp); @@ -227,7 +226,7 @@ tty_keys_init(struct tty *tty) RB_INIT(&tty->ktree); tty->ksize = 0; - for (i = 0; i < NTTYKEYS; i++) { + for (i = 0; i < nitems(tty_keys); i++) { if (*tty_keys[i].name == '-') s = tty_keys[i].name + 1; else { -- cgit