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

Renaming the parameter 'whole_word' to 'whole_word_only', 

because the first sounds too much like "found_whole" to me.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5216 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2015-04-25 15:26:09 +00:00
parent b454d9c89b
commit df7524d7e8
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -2,6 +2,8 @@
* src/search.c (do_replace_loop): Remove the unintended special * src/search.c (do_replace_loop): Remove the unintended special
case for replacing multiple occurrences of a literal ^ or $. case for replacing multiple occurrences of a literal ^ or $.
* src/search.c (findnextstr): Delete an always-FALSE parameter. * src/search.c (findnextstr): Delete an always-FALSE parameter.
* src/search.c (findnextstr): Rename the parameter 'whole_word'
to 'whole_word_only', for clarity.
2015-04-21 Benno Schulenberg <bensberg@justemail.net> 2015-04-21 Benno Schulenberg <bensberg@justemail.net>
* src/browser.c (findnextfile): Save the settings of the global * src/browser.c (findnextfile): Save the settings of the global

4
src/proto.h
View File

@ -582,7 +582,7 @@ void search_replace_abort(void);
int search_init(bool replacing, bool use_answer); int search_init(bool replacing, bool use_answer);
bool findnextstr( bool findnextstr(
#ifndef DISABLE_SPELLER #ifndef DISABLE_SPELLER
bool whole_word, bool whole_word_only,
#endif #endif
const filestruct *begin, size_t begin_x, const filestruct *begin, size_t begin_x,
const char *needle, size_t *needle_len); const char *needle, size_t *needle_len);
@ -597,7 +597,7 @@ int replace_regexp(char *string, bool create);
char *replace_line(const char *needle); char *replace_line(const char *needle);
ssize_t do_replace_loop( ssize_t do_replace_loop(
#ifndef DISABLE_SPELLER #ifndef DISABLE_SPELLER
bool whole_word, bool whole_word_only,
#endif #endif
bool *canceled, const filestruct *real_current, size_t bool *canceled, const filestruct *real_current, size_t
*real_current_x, const char *needle); *real_current_x, const char *needle);

10
src/search.c
View File

@ -255,7 +255,7 @@ int search_init(bool replacing, bool use_answer)
* to the length of the string we found if it isn't NULL. */ * to the length of the string we found if it isn't NULL. */
bool findnextstr( bool findnextstr(
#ifndef DISABLE_SPELLER #ifndef DISABLE_SPELLER
bool whole_word, bool whole_word_only,
#endif #endif
const filestruct *begin, size_t begin_x, const filestruct *begin, size_t begin_x,
const char *needle, size_t *needle_len) const char *needle, size_t *needle_len)
@ -315,7 +315,7 @@ bool findnextstr(
#ifndef DISABLE_SPELLER #ifndef DISABLE_SPELLER
/* If we're searching for whole words, see if this potential /* If we're searching for whole words, see if this potential
* match is a whole word. */ * match is a whole word. */
if (whole_word) { if (whole_word_only) {
char *word = mallocstrncpy(NULL, found, found_len + 1); char *word = mallocstrncpy(NULL, found, found_len + 1);
word[found_len] = '\0'; word[found_len] = '\0';
@ -326,7 +326,7 @@ bool findnextstr(
/* If we're searching for whole words and this potential /* If we're searching for whole words and this potential
* match isn't a whole word, continue searching. */ * match isn't a whole word, continue searching. */
if (!whole_word || found_whole) if (!whole_word_only || found_whole)
#endif #endif
break; break;
} }
@ -616,7 +616,7 @@ char *replace_line(const char *needle)
* canceled isn't NULL, set it to TRUE if we canceled. */ * canceled isn't NULL, set it to TRUE if we canceled. */
ssize_t do_replace_loop( ssize_t do_replace_loop(
#ifndef DISABLE_SPELLER #ifndef DISABLE_SPELLER
bool whole_word, bool whole_word_only,
#endif #endif
bool *canceled, const filestruct *real_current, size_t bool *canceled, const filestruct *real_current, size_t
*real_current_x, const char *needle) *real_current_x, const char *needle)
@ -655,7 +655,7 @@ ssize_t do_replace_loop(
findnextstr_wrap_reset(); findnextstr_wrap_reset();
while (findnextstr( while (findnextstr(
#ifndef DISABLE_SPELLER #ifndef DISABLE_SPELLER
whole_word, whole_word_only,
#endif #endif
real_current, *real_current_x, needle, &match_len)) { real_current, *real_current_x, needle, &match_len)) {
int i = 0; int i = 0;