mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2024-11-22 04:41:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rewriting the loop, and constifying the input of sctofunc().

Browse Source 
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5530 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Benno Schulenberg 2016-01-04 09:52:43 +00:00
parent 7a08fa63f5
commit dd29c56993
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,6 +1,7 @@
2016-01-04 Benno Schulenberg <bensberg@justemail.net>
* src/global.c (shortcut_init): Nowadays the functions are defined
only once, so there is no longer any need to free existing ones.
* src/global.c (sctofunc): Rewrite the loop, and constify the input.
2016-01-04 Mike Frysinger <vapier@gentoo.org>
* src/global.c (strtosc, strtomenu): Constify the input parameter.

8
src/global.c
View File

@ -1260,12 +1260,12 @@ void set_spell_shortcuts(void)
}
#endif
const subnfunc *sctofunc(sc *s)
const subnfunc *sctofunc(const sc *s)
{
subnfunc *f;
subnfunc *f = allfuncs;
for (f = allfuncs; f != NULL && s->scfunc != f->scfunc; f = f->next)
;
while (f != NULL && f->scfunc != s->scfunc)
f = f->next;
return f;
}

2
src/nano.c
View File

@ -1702,7 +1702,7 @@ int do_input(bool allow_funcs)
}
if (have_shortcut) {
const subnfunc *f = sctofunc((sc *)s);
const subnfunc *f = sctofunc(s);
/* If the function associated with this shortcut is
* cutting or copying text, remember this. */
if (s->scfunc == do_cut_text_void

2
src/prompt.c
View File

@ -210,7 +210,7 @@ int do_statusbar_input(bool *ran_func, bool *finished,
* functions and setting finished to TRUE to indicate
* that we're done after running or trying to run their
* associated functions. */
f = sctofunc((sc *) s);
f = sctofunc(s);
if (s->scfunc != NULL) {
*ran_func = TRUE;
if (f && (!ISSET(VIEW_MODE) || f->viewok) &&

2
src/proto.h
View File

@ -370,7 +370,7 @@ void shortcut_init(void);
void set_lint_or_format_shortcuts(void);
void set_spell_shortcuts(void);
#endif
const subnfunc *sctofunc(sc *s);
const subnfunc *sctofunc(const sc *s);
const char *flagtostr(int flag);
sc *strtosc(const char *input);
int strtomenu(const char *input);