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

tweaks: don't bother executing two functions that are empty 

The get_history_older_void() and get_history_newer_void() functions
are mere names, they don't actually do anything.  So... don't bother
to execute them, so the 'finished' variable doesn't have to be reset
after calling them.

Also, normalize the order of those two empty functions.
master
Benno Schulenberg 2019-02-10 20:17:22 +01:00
parent ea4ba3a150
commit 757d223064
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/history.c
View File

@ -167,14 +167,12 @@ char *get_history_newer(filestruct **h)
return (*h)->data; return (*h)->data;
} }
/* More placeholders. */ /* Two empty placeholder functions. */
void get_history_newer_void(void)
{
;
}
void get_history_older_void(void) void get_history_older_void(void)
{ {
; }
void get_history_newer_void(void)
{
} }
#ifdef ENABLE_TABCOMP #ifdef ENABLE_TABCOMP

17
src/prompt.c
View File

@ -126,6 +126,11 @@ int do_statusbar_input(bool *finished)
if (shortcut) { if (shortcut) {
if (shortcut->func == do_tab || shortcut->func == do_enter) if (shortcut->func == do_tab || shortcut->func == do_enter)
; ;
#ifdef ENABLE_HISTORIES
else if (shortcut->func == get_history_older_void ||
shortcut->func == get_history_newer_void)
;
#endif
else if (shortcut->func == do_left) else if (shortcut->func == do_left)
do_statusbar_left(); do_statusbar_left();
else if (shortcut->func == do_right) else if (shortcut->func == do_right)
@ -518,12 +523,6 @@ functionptrtype acquire_an_answer(int *actual, bool allow_tabs,
answer = mallocstrcpy(answer, history); answer = mallocstrcpy(answer, history);
typing_x = strlen(answer); typing_x = strlen(answer);
} }
/* This key has a shortcut-list entry when it's used to
* move to an older search, which means that finished has
* been set to TRUE. Set it back to FALSE here, so that
* we aren't kicked out of the statusbar prompt. */
finished = FALSE;
} }
} else if (func == get_history_newer_void) { } else if (func == get_history_newer_void) {
if (history_list != NULL) { if (history_list != NULL) {
@ -541,12 +540,6 @@ functionptrtype acquire_an_answer(int *actual, bool allow_tabs,
answer = mallocstrcpy(answer, magichistory); answer = mallocstrcpy(answer, magichistory);
typing_x = strlen(answer); typing_x = strlen(answer);
} }
/* This key has a shortcut-list entry when it's used to
* move to a newer search, which means that finished has
* been set to TRUE. Set it back to FALSE here, so that
* we aren't kicked out of the statusbar prompt. */
finished = FALSE;
} }
} else } else
#endif /* ENABLE_HISTORIES */ #endif /* ENABLE_HISTORIES */