nano

commit 1f934e3a8b2276e8110c3394d64c7f1dbf44d8d9
parent cc054ec00efd2009414fa85e3803f4ae06aae500
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Sun, 13 Apr 2014 11:56:08 +0000

Removing unused parameter 'menu' from strtosc().


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

Diffstat:
M
ChangeLog
 | 
4
++++
M
src/global.c
 | 
10
+++++-----
M
src/proto.h
 | 
2
+-
M
src/rcfile.c
 | 
2
+-

4 files changed, 11 insertions(+), 7 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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;