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

tweaks: reshuffle some code, to require two fewer ifs

master
Benno Schulenberg 2018-10-24 18:05:35 +02:00
parent f81d174f11
commit 0ad0dcc926
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/rcfile.c
View File

@ -429,7 +429,18 @@ void parse_binding(char *ptr, bool dobind)
goto free_things; goto free_things;
} }
if (dobind) { if (!dobind) {
/* Find and wipe the given shortcut from the given menu. */
for (s = sclist; s != NULL; s = s->next)
if ((s->menus & menu) && !strcmp(s->keystr, keycopy))
s->menus &= ~menu;
free_things:
free(newsc);
free(keycopy);
return;
}
subnfunc *f; subnfunc *f;
int mask = 0; int mask = 0;
@ -466,17 +477,7 @@ void parse_binding(char *ptr, bool dobind)
rcfile_error(N_("Sorry, keystroke \"%s\" may not be rebound"), newsc->keystr); rcfile_error(N_("Sorry, keystroke \"%s\" may not be rebound"), newsc->keystr);
goto free_things; goto free_things;
} }
}
if (!dobind) {
/* Find and wipe the given shortcut from the given menu. */
for (s = sclist; s != NULL; s = s->next) {
if ((s->menus & menu) && !strcmp(s->keystr, keycopy))
s->menus &= ~menu;
}
}
if (dobind) {
#ifndef NANO_TINY #ifndef NANO_TINY
/* If this is a toggle, copy its sequence number. */ /* If this is a toggle, copy its sequence number. */
if (newsc->func == do_toggle_void) { if (newsc->func == do_toggle_void) {
@ -489,12 +490,6 @@ void parse_binding(char *ptr, bool dobind)
/* Add the new shortcut at the start of the list. */ /* Add the new shortcut at the start of the list. */
newsc->next = sclist; newsc->next = sclist;
sclist = newsc; sclist = newsc;
return;
}
free_things:
free(newsc);
free(keycopy);
} }
/* Verify that the given file exists, is not a folder nor a device. */ /* Verify that the given file exists, is not a folder nor a device. */