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

tweaks: rename two variables, to be more meaningful

master
Benno Schulenberg 2018-02-04 22:02:45 +01:00
parent c3031b9b8f
commit 16d237ba1b
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/search.c
View File

@ -94,31 +94,32 @@ void search_replace_abort(void)
* when <Enter> is pressed or a non-toggle shortcut was executed. */ * when <Enter> is pressed or a non-toggle shortcut was executed. */
void search_init(bool replacing, bool keep_the_answer) void search_init(bool replacing, bool keep_the_answer)
{ {
char *buf; char *thedefault;
static char *backupstring = NULL; /* What will be searched for when the user typed nothing. */
static char *sofar = NULL;
/* What the user has typed so far, before toggling something. */ /* What the user has typed so far, before toggling something. */
if (keep_the_answer) if (keep_the_answer)
backupstring = mallocstrcpy(backupstring, answer); sofar = mallocstrcpy(sofar, answer);
/* If something was searched for earlier, include it in the prompt. */ /* If something was searched for earlier, include it in the prompt. */
if (*last_search != '\0') { if (*last_search != '\0') {
char *disp = display_string(last_search, 0, COLS / 3, FALSE); char *disp = display_string(last_search, 0, COLS / 3, FALSE);
buf = charalloc(strlen(disp) + 7); thedefault = charalloc(strlen(disp) + 7);
/* We use (COLS / 3) here because we need to see more on the line. */ /* We use (COLS / 3) here because we need to see more on the line. */
sprintf(buf, " [%s%s]", disp, sprintf(thedefault, " [%s%s]", disp,
(strlenpt(last_search) > COLS / 3) ? "..." : ""); (strlenpt(last_search) > COLS / 3) ? "..." : "");
free(disp); free(disp);
} else } else
buf = mallocstrcpy(NULL, ""); thedefault = mallocstrcpy(NULL, "");
while (TRUE) { while (TRUE) {
functionptrtype func; functionptrtype func;
/* Ask the user what to search for (or replace). */ /* Ask the user what to search for (or replace). */
int i = do_prompt(FALSE, FALSE, int i = do_prompt(FALSE, FALSE,
inhelp ? MFINDINHELP : (replacing ? MREPLACE : MWHEREIS), inhelp ? MFINDINHELP : (replacing ? MREPLACE : MWHEREIS),
backupstring, &search_history, sofar, &search_history,
/* TRANSLATORS: This is the main search prompt. */ /* TRANSLATORS: This is the main search prompt. */
edit_refresh, "%s%s%s%s%s%s", _("Search"), edit_refresh, "%s%s%s%s%s%s", _("Search"),
/* TRANSLATORS: The next three modify the search prompt. */ /* TRANSLATORS: The next three modify the search prompt. */
@ -129,14 +130,14 @@ void search_init(bool replacing, bool keep_the_answer)
/* TRANSLATORS: The next two modify the search prompt. */ /* TRANSLATORS: The next two modify the search prompt. */
openfile->mark ? _(" (to replace) in selection") : openfile->mark ? _(" (to replace) in selection") :
#endif #endif
_(" (to replace)") : "", buf); _(" (to replace)") : "", thedefault);
/* If the search was cancelled, or we have a blank answer and /* If the search was cancelled, or we have a blank answer and
* nothing was searched for yet during this session, get out. */ * nothing was searched for yet during this session, get out. */
if (i == -1 || (i == -2 && *last_search == '\0')) { if (i == -1 || (i == -2 && *last_search == '\0')) {
statusbar(_("Cancelled")); statusbar(_("Cancelled"));
search_replace_abort(); search_replace_abort();
free(buf); free(thedefault);
return; return;
} }
@ -150,7 +151,7 @@ void search_init(bool replacing, bool keep_the_answer)
#endif #endif
} }
free(buf); free(thedefault);
/* If doing a regular-expression search, compile the /* If doing a regular-expression search, compile the
* search string, and get out when it's invalid. */ * search string, and get out when it's invalid. */
@ -168,7 +169,7 @@ void search_init(bool replacing, bool keep_the_answer)
return; return;
} }
backupstring = mallocstrcpy(backupstring, answer); sofar = mallocstrcpy(sofar, answer);
func = func_from_key(&i); func = func_from_key(&i);
@ -187,7 +188,7 @@ void search_init(bool replacing, bool keep_the_answer)
do_gotolinecolumn(openfile->current->lineno, do_gotolinecolumn(openfile->current->lineno,
openfile->placewewant + 1, TRUE, TRUE); openfile->placewewant + 1, TRUE, TRUE);
search_replace_abort(); search_replace_abort();
free(buf); free(thedefault);
return; return;
} }
} }