fix shadow warnings

[ncmpc.git] / src / screen_help.c

diff --git a/src/screen_help.c b/src/screen_help.c
index 46fefd9d6e435c15729a80d52f6313bd9d3a87f3..2b5dc1f162329ef7968e52f6dc242556afe28ed2 100644 (file)
--- a/src/screen_help.c
+++ b/src/screen_help.c
@@ -18,11 +18,6 @@
  *
  */
 
-#include <stdlib.h>
-#include <string.h>
-#include <glib.h>
-#include <ncurses.h>
-
 #include "config.h"
 #include "ncmpc.h"
 #include "mpdclient.h"
@@ -30,11 +25,16 @@
 #include "screen.h"
 #include "screen_utils.h"
 
+#include <stdlib.h>
+#include <string.h>
+#include <glib.h>
+#include <ncurses.h>
+
 
 typedef struct {
        signed char highlight;
        command_t command;
-       char *text;
+       const char *text;
 } help_text_row_t;
 
 static help_text_row_t help_text[] = 
@@ -146,8 +146,8 @@ static int help_text_rows = -1;
 static list_window_t *lw = NULL;
 
 
-static char *
-list_callback(int index, int *highlight, void *data)
+static const char *
+list_callback(int idx, int *highlight, void *data)
 {
        static char buf[512];
 
@@ -158,12 +158,12 @@ list_callback(int index, int *highlight, void *data)
        }
 
        *highlight = 0;
-       if (index < help_text_rows) {
-               *highlight = help_text[index].highlight > 0;
-               if (help_text[index].command == CMD_NONE) {
-                       if (help_text[index].text)
-                               g_snprintf(buf, sizeof(buf), "      %s", _(help_text[index].text));
-                       else if (help_text[index].highlight == 2) {
+       if (idx < help_text_rows) {
+               *highlight = help_text[idx].highlight > 0;
+               if (help_text[idx].command == CMD_NONE) {
+                       if (help_text[idx].text)
+                               g_snprintf(buf, sizeof(buf), "      %s", _(help_text[idx].text));
+                       else if (help_text[idx].highlight == 2) {
                                int i;
 
                                for (i = 3; i < COLS - 3 && i < sizeof(buf); i++)
@@ -174,16 +174,16 @@ list_callback(int index, int *highlight, void *data)
                        return buf;
                }
 
-               if (help_text[index].text)
+               if (help_text[idx].text)
                        g_snprintf(buf, sizeof(buf),
                                   "%20s : %s   ",
-                                  get_key_names(help_text[index].command, TRUE),
-                                  _(help_text[index].text));
+                                  get_key_names(help_text[idx].command, TRUE),
+                                  _(help_text[idx].text));
                else
                        g_snprintf(buf, sizeof(buf),
                                   "%20s : %s   ",
-                                  get_key_names(help_text[index].command, TRUE),
-                                  get_key_description(help_text[index].command));
+                                  get_key_names(help_text[idx].command, TRUE),
+                                  get_key_description(help_text[idx].command));
                return buf;
        }
 
@@ -211,7 +211,7 @@ help_exit(void)
 }
 
 
-static char *
+static const char *
 help_title(char *str, size_t size)
 {
        return _("Help");