mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2025-03-20 00:12:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

tweaks: drop shunting of flags by calling the needed function directly

Browse Source 
Calling strstrwrapper() with the Backwards, Casesens, and Regex flags
unset is equivalent to calling mbstrcasestr().  So... do that instead
and quit saving and restoring the flags for each call of findfile().

This saving-and-restoring has been redundant since commit b0957254
from eight years ago.
This commit is contained in:
Benno Schulenberg 2022-09-11 11:42:10 +02:00
parent e30eadb4de
commit 7034c3cc47
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/browser.c
View File

@ -263,16 +263,6 @@ void findfile(const char *needle, bool forwards)
/* The location in the file list of the filename we're looking at. */
const char *thename;
/* The plain filename, without the path. */
unsigned stash[sizeof(flags) / sizeof(flags[0])];
/* A storage place for the current flag settings. */
/* Save the settings of all flags. */
memcpy(stash, flags, sizeof(flags));
/* Search forward, case insensitive, and without regexes. */
UNSET(BACKWARDS_SEARCH);
UNSET(CASE_SENSITIVE);
UNSET(USE_REGEXP);
/* Step through each filename in the list until a match is found or
* we've come back to the point where we started. */
@ -294,7 +284,7 @@ void findfile(const char *needle, bool forwards)
/* If the needle matches, we're done. And if we're back at the file
* where we started, it is the only occurrence. */
if (strstrwrapper(thename, needle, thename)) {
if (mbstrcasestr(thename, needle)) {
if (looking_at == selected)
statusbar(_("This is the only occurrence"));
break;
@ -307,9 +297,6 @@ void findfile(const char *needle, bool forwards)
}
}
/* Restore the settings of all flags. */
memcpy(flags, stash, sizeof(flags));
/* Select the one we've found. */
selected = looking_at;
}