fix gcc warnings on shadowed declarations

[paraslash.git] / gui.c

diff --git a/gui.c b/gui.c
index 49f8f46f523742eab96346103830b5dadc9b3416..ffd1ea842039760bd6a1ec268a01423334bbb368 100644 (file)
--- a/gui.c
+++ b/gui.c
@@ -61,7 +61,7 @@ static pid_t external_cmd_pid;
 
 static int command_pipe = -1;
 static int audiod_pipe = -1;
-static struct gengetopt_args_info conf;
+static struct gui_args_info conf;
 
 enum {GETCH_MODE, COMMAND_MODE, EXTERNAL_MODE};
 
@@ -893,10 +893,7 @@ repeat:
        /* command pipe only for COMMAND_MODE */
        if (command_pipe >= 0 && mode == COMMAND_MODE)
                para_fd_set(command_pipe, &rfds, &max_fileno);
-       if (curses_active)
-               para_fd_set(STDIN_FILENO, &rfds, &max_fileno);
        ret = para_select(max_fileno + 1, &rfds, NULL, &tv);
-//     PARA_DEBUG_LOG("select returned %d\n", ret);
        if (ret <= 0)
                goto check_return; /* skip fd checks */
        /* signals */
@@ -1086,22 +1083,22 @@ static void com_scroll_up(void)
 {
        struct rb_entry *rbe = NULL;
        unsigned lines;
-       int i, first_rbe, scroll;
+       int i, first_rbe, num_scroll;
 
        /* the entry that is going to vanish */
        rbe = ringbuffer_get(bot_win_rb, scroll_position);
        if (!rbe)
                goto err_out;
-       scroll = NUM_LINES(rbe->len);
+       num_scroll = NUM_LINES(rbe->len);
        first_rbe = first_visible_rbe(&lines);
        if (first_rbe < 0 || (first_rbe == ringbuffer_filled(bot_win_rb) - 1))
                goto err_out;
        scroll_position++;
-       wscrl(bot.win, -scroll);
+       wscrl(bot.win, -num_scroll);
        i = draw_top_rbe(&lines);
        if (i < 0)
                goto err_out;
-       while (i > 0 && lines < scroll) {
+       while (i > 0 && lines < num_scroll) {
                int rbe_lines;
                rbe = ringbuffer_get(bot_win_rb, --i);
                if (!rbe)
@@ -1157,8 +1154,8 @@ static void com_reread_conf(void)
                return;
        }
        PARA_INFO_LOG("%s", "rereading command line options and config file");
-       cmdline_parser(_argc, _argv, &conf);
-       cmdline_parser_configfile(cf, &conf, 1, 1, 0);
+       gui_cmdline_parser(_argc, _argv, &conf);
+       gui_cmdline_parser_configfile(cf, &conf, 1, 1, 0);
        PARA_NOTICE_LOG("%s", "configuration read");
        if (check_key_map_args() < 0)
                finish(EXIT_FAILURE);
@@ -1315,7 +1312,7 @@ int main(int argc, char *argv[])
        _argc = argc;
        _argv = argv;
 
-       if (cmdline_parser(argc, argv, &conf)) {
+       if (gui_cmdline_parser(argc, argv, &conf)) {
                fprintf(stderr, "parse error while reading command line\n");
                exit(EXIT_FAILURE);
        }
@@ -1332,7 +1329,7 @@ int main(int argc, char *argv[])
                exit(EXIT_FAILURE);
        }
        if (cf)
-               cmdline_parser_configfile(cf, &conf, 0, 0, 0);
+               gui_cmdline_parser_configfile(cf, &conf, 0, 0, 0);
        if (check_key_map_args() < 0) {
                fprintf(stderr, "invalid key map in config file\n");
                exit(EXIT_FAILURE);