From c5841193570edf6eca119c583d9e790eef12dcb1 Mon Sep 17 00:00:00 2001 From: okan Date: Tue, 22 Mar 2011 10:57:31 +0000 Subject: introduce nitems macro, with the appropriate ifndef. ok oga@ --- search.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'search.c') diff --git a/search.c b/search.c index 940e4cd..df9ce80 100644 --- a/search.c +++ b/search.c @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: search.c,v 1.21 2010/09/25 20:01:27 okan Exp $ + * $Id: search.c,v 1.22 2011/03/22 10:57:31 okan Exp $ */ #include @@ -42,9 +42,6 @@ search_match_client(struct menu_q *menuq, struct menu_q *resultq, char *search) { struct winname *wn; struct menu *mi, *tierp[4], *before = NULL; - int ntiers; - - ntiers = sizeof(tierp) / sizeof(tierp[0]); TAILQ_INIT(resultq); @@ -92,14 +89,14 @@ search_match_client(struct menu_q *menuq, struct menu_q *resultq, char *search) * window. Furthermore, this is denoted by a "!" when * printing the window name in the search menu. */ - if (cc == client_current() && tier < ntiers - 1) + if (cc == client_current() && tier < nitems(tierp) - 1) tier++; /* Clients that are hidden get ranked one up. */ if (cc->flags & CLIENT_HIDDEN && tier > 0) tier--; - assert(tier < ntiers); + assert(tier < nitems(tierp)); /* * If you have a tierp, insert after it, and make it -- cgit v1.2.3-2-gb3c3