tweaks: invert two conditions and reshuffle, to reduce duplication
parent
d0f37205af
commit
62007c84c6
15
src/search.c
15
src/search.c
|
@ -130,21 +130,18 @@ void search_init(bool replacing, bool keep_the_answer)
|
|||
#endif
|
||||
}
|
||||
|
||||
free(thedefault);
|
||||
|
||||
/* If doing a regular-expression search, compile the
|
||||
* search string, and get out when it's invalid. */
|
||||
if (ISSET(USE_REGEXP) && !regexp_init(last_search)) {
|
||||
tidy_up_after_search();
|
||||
return;
|
||||
}
|
||||
|
||||
/* When not doing a regular-expression search, just search;
|
||||
* otherwise compile the search string, and only search when
|
||||
* the expression is valid. */
|
||||
if (!ISSET(USE_REGEXP) || regexp_init(last_search)) {
|
||||
if (replacing)
|
||||
ask_for_replacement();
|
||||
else
|
||||
go_looking();
|
||||
}
|
||||
|
||||
tidy_up_after_search();
|
||||
free(thedefault);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue