From: Max Kellermann <max@duempel.org>
Date: Wed, 17 Sep 2008 10:25:40 +0000 (+0200)
Subject: help: converted help_text_rows to a macro
X-Git-Tag: v0.12_alpha1~269
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=93414ec4a69b58269715ceec18531e3177d66f5f;p=ncmpc.git

help: converted help_text_rows to a macro

Why bother counting the elements of help_text[] (with sentinel) at
runtime, when the compiler can do it at compile time?
---

diff --git a/src/screen_help.c b/src/screen_help.c
index 363b440..05b735e 100644
--- a/src/screen_help.c
+++ b/src/screen_help.c
@@ -139,11 +139,10 @@ static help_text_row_t help_text[] =
   { 0, CMD_LYRICS_UPDATE,         N_("Explicitly download lyrics") },
   { 0, CMD_ADD,         N_("Save lyrics") }, 
 #endif
-  { 0, CMD_NONE, NULL },
-  {-1, CMD_NONE, NULL }
 };
 
-static int help_text_rows = -1;
+#define help_text_rows (sizeof(help_text) / sizeof(help_text[0]))
+
 static list_window_t *lw = NULL;
 
 
@@ -152,14 +151,8 @@ list_callback(unsigned idx, int *highlight, mpd_unused void *data)
 {
 	static char buf[512];
 
-	if (help_text_rows < 0) {
-		help_text_rows = 0;
-		while (help_text[help_text_rows].highlight != -1)
-			help_text_rows++;
-	}
-
 	*highlight = 0;
-	if (idx < (unsigned)help_text_rows) {
+	if (idx < help_text_rows) {
 		*highlight = help_text[idx].highlight > 0;
 		if (help_text[idx].command == CMD_NONE) {
 			if (help_text[idx].text)