ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removing unused parameter 'menu' from strtosc(). 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4758 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2014-04-13 11:56:08 +00:00
parent cc054ec00e
commit 1f934e3a8b
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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> 2014-04-10 Benno Schulenberg <bensberg@justemail.net>
* doc/syntax/Makefile.am: Add four recent syntaxes to the packlist. * doc/syntax/Makefile.am: Add four recent syntaxes to the packlist.

10
src/global.c
View File

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

2
src/proto.h
View File

@ -804,7 +804,7 @@ const char *flagtostr(int flag);
const subnfunc *sctofunc(sc *s); const subnfunc *sctofunc(sc *s);
const subnfunc *getfuncfromkey(WINDOW *win); const subnfunc *getfuncfromkey(WINDOW *win);
void print_sclist(void); void print_sclist(void);
sc *strtosc(int menu, char *input); sc *strtosc(char *input);
function_type strtokeytype(const char *str); function_type strtokeytype(const char *str);
int strtomenu(char *input); int strtomenu(char *input);
void assign_keyinfo(sc *s); void assign_keyinfo(sc *s);

2
src/rcfile.c
View File

@ -530,7 +530,7 @@ void parse_binding(char *ptr, bool dobind)
} }
if (dobind) { if (dobind) {
newsc = strtosc(menu, funcptr); newsc = strtosc(funcptr);
if (newsc == NULL) { if (newsc == NULL) {
rcfile_error(N_("Cannot map name \"%s\" to a function"), funcptr); rcfile_error(N_("Cannot map name \"%s\" to a function"), funcptr);
return; return;