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

search: elide an unneeded function 

When we're spell checking, we don't need a special mechanism to detect
we have come full circle: reaching the end-of-buffer means we're done.
So don't bother to reset came_full_circle when we're spell checking
(when begin == NULL) but simply ignore its value.
master
Benno Schulenberg 2016-05-01 13:38:54 +02:00
parent e21e954742
commit 05238f31f4
3 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/proto.h
View File

@ -590,7 +590,6 @@ int findnextstr(
#endif #endif
const filestruct *begin, size_t begin_x, const filestruct *begin, size_t begin_x,
const char *needle, size_t *match_len); const char *needle, size_t *match_len);
void reset_full_circle_flag(void);
void do_search(void); void do_search(void);
#ifndef NANO_TINY #ifndef NANO_TINY
void do_findprevious(void); void do_findprevious(void);

14
src/search.c
View File

@ -336,7 +336,7 @@ int findnextstr(
} }
/* If we're back at the beginning, then there is no needle. */ /* If we're back at the beginning, then there is no needle. */
if (came_full_circle) { if (came_full_circle && begin != NULL) {
not_found_msg(needle); not_found_msg(needle);
disable_nodelay(); disable_nodelay();
return 0; return 0;
@ -399,7 +399,6 @@ int findnextstr(
return 0; return 0;
} }
disable_nodelay(); disable_nodelay();
/* Set the current position to point at what we found. */ /* Set the current position to point at what we found. */
@ -417,13 +416,6 @@ int findnextstr(
return 1; return 1;
} }
/* Clear the flag indicating that a search reached the last line of the
* file. We need to do this just before a new search. */
void reset_full_circle_flag(void)
{
came_full_circle = FALSE;
}
/* Ask what to search for and then go looking for it. */ /* Ask what to search for and then go looking for it. */
void do_search(void) void do_search(void)
{ {
@ -505,7 +497,7 @@ void go_looking(void)
size_t was_current_x = openfile->current_x; size_t was_current_x = openfile->current_x;
int didfind; int didfind;
reset_full_circle_flag(); came_full_circle = FALSE;
didfind = findnextstr( didfind = findnextstr(
#ifndef DISABLE_SPELLER #ifndef DISABLE_SPELLER
@ -653,7 +645,7 @@ ssize_t do_replace_loop(
} }
#endif /* !NANO_TINY */ #endif /* !NANO_TINY */
reset_full_circle_flag(); came_full_circle = FALSE;
while (TRUE) { while (TRUE) {
int i = 0; int i = 0;

4
src/text.c
View File

@ -2417,10 +2417,8 @@ bool do_int_spell_fix(const char *word)
openfile->current = openfile->fileage; openfile->current = openfile->fileage;
openfile->current_x = (size_t)-1; openfile->current_x = (size_t)-1;
reset_full_circle_flag();
/* Find the first whole occurrence of word. */ /* Find the first whole occurrence of word. */
result = findnextstr(TRUE, openfile->fileage, 0, word, NULL); result = findnextstr(TRUE, NULL, 0, word, NULL);
/* The word must exist; if not, something is wrong. */ /* The word must exist; if not, something is wrong. */
if (result == 0) if (result == 0)