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

Chopping a parameter that is now unused, or rather: always NULL. 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5775 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2016-03-29 15:05:47 +00:00
parent 23b8dfd98e
commit b834ed3b28
4 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -8,6 +8,7 @@
* src/chars.c (is_valid_unicode): Speed up Unicode validation. * src/chars.c (is_valid_unicode): Speed up Unicode validation.
* src/text.c (do_int_spell_fix): Allow to stop replacing a word * src/text.c (do_int_spell_fix): Allow to stop replacing a word
without aborting the entire spell-fixing session. without aborting the entire spell-fixing session.
* src/search.c (do_replace_loop): Chop a now-unused parameter.
2016-03-28 Benno Schulenberg <bensberg@justemail.net> 2016-03-28 Benno Schulenberg <bensberg@justemail.net>
* src/winio.c (statusbar): Don't bother putting back the cursor in * src/winio.c (statusbar): Don't bother putting back the cursor in

4
src/proto.h
View File

@ -606,8 +606,8 @@ ssize_t do_replace_loop(
#ifndef DISABLE_SPELLER #ifndef DISABLE_SPELLER
bool whole_word_only, bool whole_word_only,
#endif #endif
bool *canceled, const filestruct *real_current, size_t const filestruct *real_current, size_t *real_current_x,
*real_current_x, const char *needle); const char *needle);
void do_replace(void); void do_replace(void);
void goto_line_posx(ssize_t line, size_t pos_x); void goto_line_posx(ssize_t line, size_t pos_x);
void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer, void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,

14
src/search.c
View File

@ -611,8 +611,8 @@ ssize_t do_replace_loop(
#ifndef DISABLE_SPELLER #ifndef DISABLE_SPELLER
bool whole_word_only, bool whole_word_only,
#endif #endif
bool *canceled, const filestruct *real_current, size_t const filestruct *real_current, size_t *real_current_x,
*real_current_x, const char *needle) const char *needle)
{ {
ssize_t numreplaced = -1; ssize_t numreplaced = -1;
size_t match_len; size_t match_len;
@ -642,9 +642,6 @@ ssize_t do_replace_loop(
} }
#endif /* !NANO_TINY */ #endif /* !NANO_TINY */
if (canceled != NULL)
*canceled = FALSE;
findnextstr_wrap_reset(); findnextstr_wrap_reset();
while (findnextstr( while (findnextstr(
#ifndef DISABLE_SPELLER #ifndef DISABLE_SPELLER
@ -690,11 +687,8 @@ ssize_t do_replace_loop(
free(exp_word); free(exp_word);
if (i == -1) { /* We canceled the replace. */ if (i == -1) /* The replacing was cancelled. */
if (canceled != NULL)
*canceled = TRUE;
break; break;
}
} }
if (i > 0 || replaceall) { /* Yes, replace it!!!! */ if (i > 0 || replaceall) { /* Yes, replace it!!!! */
@ -860,7 +854,7 @@ void do_replace(void)
#ifndef DISABLE_SPELLER #ifndef DISABLE_SPELLER
FALSE, FALSE,
#endif #endif
NULL, begin, &begin_x, last_search); begin, &begin_x, last_search);
/* Restore where we were. */ /* Restore where we were. */
openfile->edittop = edittop_save; openfile->edittop = edittop_save;

2
src/text.c
View File

@ -2448,7 +2448,7 @@ bool do_int_spell_fix(const char *word)
if (!canceled && strcmp(word, answer) != 0) { if (!canceled && strcmp(word, answer) != 0) {
openfile->current_x--; openfile->current_x--;
do_replace_loop(TRUE, NULL, openfile->current, do_replace_loop(TRUE, openfile->current,
&openfile->current_x, word); &openfile->current_x, word);
} }