screen: remove redundant #ifndef

[ncmpc.git] / src / screen_keydef.c

diff --git a/src/screen_keydef.c b/src/screen_keydef.c
index ad78c383d48b235ec6a12bc9f1ab8659c8821819..44b191c26d0a40672473faf6c94b7193b66ca8f7 100644 (file)
--- a/src/screen_keydef.c
+++ b/src/screen_keydef.c
@@ -1,5 +1,5 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2010 The Music Player Daemon Project
+ * (c) 2004-2017 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -25,6 +25,7 @@
 #include "conf.h"
 #include "screen.h"
 #include "screen_utils.h"
+#include "options.h"
 #include "Compiler.h"
 
 #include <assert.h>
@@ -145,31 +146,33 @@ apply_keys(void)
 static int
 save_keys(void)
 {
-       FILE *f;
-       char *filename;
+       char *allocated = NULL;
+       const char *filename = options.key_file;
+       if (filename == NULL) {
+               if (!check_user_conf_dir()) {
+                       screen_status_printf(_("Error: Unable to create directory ~/.ncmpc - %s"),
+                                            strerror(errno));
+                       screen_bell();
+                       return -1;
+               }
 
-       if (check_user_conf_dir()) {
-               screen_status_printf(_("Error: Unable to create directory ~/.ncmpc - %s"),
-                                    strerror(errno));
-               screen_bell();
-               return -1;
+               filename = allocated = build_user_key_binding_filename();
        }
 
-       filename = build_user_key_binding_filename();
-
-       if ((f = fopen(filename,"w")) == NULL) {
+       FILE *f = fopen(filename, "w");
+       if (f == NULL) {
                screen_status_printf(_("Error: %s - %s"), filename, strerror(errno));
                screen_bell();
-               g_free(filename);
+               g_free(allocated);
                return -1;
        }
 
        if (write_key_bindings(f, KEYDEF_WRITE_HEADER))
-               screen_status_printf(_("Error: %s - %s"), filename, strerror(errno));
-       else
                screen_status_printf(_("Wrote %s"), filename);
+       else
+               screen_status_printf(_("Error: %s - %s"), filename, strerror(errno));
 
-       g_free(filename);
+       g_free(allocated);
        return fclose(f);
 }
 
@@ -192,13 +195,6 @@ check_subcmd_length(void)
 static void
 keydef_paint(void);
 
-static void
-keydef_repaint(void)
-{
-       keydef_paint();
-       wrefresh(lw->w);
-}
-
 /** lw->start the last time switch_to_subcmd_mode() was called */
 static unsigned saved_start = 0;
 
@@ -213,7 +209,7 @@ switch_to_subcmd_mode(int cmd)
        list_window_reset(lw);
        check_subcmd_length();
 
-       keydef_repaint();
+       keydef_paint();
 }
 
 static void
@@ -227,7 +223,7 @@ switch_to_command_mode(void)
 
        lw->start = saved_start;
 
-       keydef_repaint();
+       keydef_paint();
 }
 
 /**
@@ -254,7 +250,7 @@ delete_key(int cmd_index, int key_index)
        screen_status_printf(_("Deleted"));
 
        /* repaint */
-       keydef_repaint();
+       keydef_paint();
 
        /* update key conflict flags */
        check_key_bindings(cmds, NULL, 0);
@@ -264,14 +260,11 @@ delete_key(int cmd_index, int key_index)
 static void
 overwrite_key(int cmd_index, int key_index)
 {
-       int key;
-       char *buf;
-       command_t cmd;
-
        assert(key_index < MAX_COMMAND_KEYS);
 
-       buf = g_strdup_printf(_("Enter new key for %s: "), cmds[cmd_index].name);
-       key = screen_getch(buf);
+       char *buf = g_strdup_printf(_("Enter new key for %s: "),
+                                   cmds[cmd_index].name);
+       const int key = screen_getch(buf);
        g_free(buf);
 
        if (key == ERR) {
@@ -284,7 +277,7 @@ overwrite_key(int cmd_index, int key_index)
                return;
        }
 
-       cmd = find_key_command(key, cmds);
+       const command_t cmd = find_key_command(key, cmds);
        if (cmd != CMD_NONE) {
                screen_status_printf(_("Error: key %s is already used for %s"),
                                     key2str(key), get_key_command_name(cmd));
@@ -300,7 +293,7 @@ overwrite_key(int cmd_index, int key_index)
        check_subcmd_length();
 
        /* repaint */
-       keydef_repaint();
+       keydef_paint();
 
        /* update key conflict flags */
        check_key_bindings(cmds, NULL, 0);
@@ -392,14 +385,13 @@ keydef_open(gcc_unused struct mpdclient *c)
 {
        if (cmds == NULL) {
                command_definition_t *current_cmds = get_command_definitions();
-               size_t cmds_size;
-
                command_n_commands = 0;
                while (current_cmds[command_n_commands].name)
                        command_n_commands++;
 
                /* +1 for the terminator element */
-               cmds_size = (command_n_commands + 1) * sizeof(command_definition_t);
+               size_t cmds_size = (command_n_commands + 1)
+                       * sizeof(command_definition_t);
                cmds = g_malloc0(cmds_size);
                memcpy(cmds, current_cmds, cmds_size);
        }
@@ -441,7 +433,7 @@ keydef_cmd(gcc_unused struct mpdclient *c, command_t cmd)
                return false;
 
        if (list_window_cmd(lw, cmd)) {
-               keydef_repaint();
+               keydef_paint();
                return true;
        }
 
@@ -491,7 +483,7 @@ keydef_cmd(gcc_unused struct mpdclient *c, command_t cmd)
        case CMD_LIST_FIND_NEXT:
        case CMD_LIST_RFIND_NEXT:
                screen_find(lw, cmd, list_callback, NULL);
-               keydef_repaint();
+               keydef_paint();
                return true;
 
        default: