Removing unused parameter 'menu' from strtosc().

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4758 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 86b2a8063a2ba86ce334e6cfab01db8dd2220434..e09bcfb116eb1cbf8dee6a00b94b3bdbae3baf04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-13  Benno Schulenberg  <bensberg@justemail.net>
+       * proto.h, global.c, rcfile.c: Remove unused parameter 'menu'
+       from strtosc().
+
 2014-04-10  Benno Schulenberg  <bensberg@justemail.net>
        * doc/syntax/Makefile.am: Add four recent syntaxes to the packlist.
 

diff --git a/src/global.c b/src/global.c
index e074738fff3e310220827911da9a64f23ac45826..676d4b049491b693b6f4dd7829fe09e385362172 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -1340,14 +1340,14 @@ const char *flagtostr(int flag)
 }
 #endif /* !NANO_TINY */
 
-/* Interpret the string given by the rc file and return a shortcut
- * struct, complete with proper value for execute. */
-sc *strtosc(int menu, char *input)
+/* Interpret a function string given in the rc file, and return a
+ * shortcut struct, complete with the proper value for execute. */
+sc *strtosc(char *input)
 {
-     sc *s;
+    sc *s;
 
     s = (sc *)nmalloc(sizeof(sc));
-    s->execute = TRUE; /* overridden as needed below */
+    s->execute = TRUE; /* will be overridden as needed below */
 
 #ifndef DISABLE_HELP
     if (!strcasecmp(input, "help"))

diff --git a/src/proto.h b/src/proto.h
index f47fa8a60991b2f0347384e9eaa8c24917e32495..13afab8f2a04888d2109dcd3c0f5e85665ad2862 100644 (file)
--- a/src/proto.h
+++ b/src/proto.h
@@ -804,7 +804,7 @@ const char *flagtostr(int flag);
 const subnfunc *sctofunc(sc *s);
 const subnfunc *getfuncfromkey(WINDOW *win);
 void print_sclist(void);
-sc *strtosc(int menu, char *input);
+sc *strtosc(char *input);
 function_type strtokeytype(const char *str);
 int strtomenu(char *input);
 void assign_keyinfo(sc *s);

diff --git a/src/rcfile.c b/src/rcfile.c
index 02fc8ba9eae96d9b3fc60fd2670cd9067baffa0f..c93291920df190e48c63f10af92b2424af0764db 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -530,7 +530,7 @@ void parse_binding(char *ptr, bool dobind)
     }
 
     if (dobind) {
-       newsc = strtosc(menu, funcptr);
+       newsc = strtosc(funcptr);
        if (newsc == NULL) {
            rcfile_error(N_("Cannot map name \"%s\" to a function"), funcptr);
            return;