From b834ed3b28729fbb97e103880f682dca70d6bc1d Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Tue, 29 Mar 2016 15:05:47 +0000 Subject: [PATCH] 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 --- ChangeLog | 1 + src/proto.h | 4 ++-- src/search.c | 14 ++++---------- src/text.c | 2 +- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 37be69ab..853237f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ * src/chars.c (is_valid_unicode): Speed up Unicode validation. * src/text.c (do_int_spell_fix): Allow to stop replacing a word without aborting the entire spell-fixing session. + * src/search.c (do_replace_loop): Chop a now-unused parameter. 2016-03-28 Benno Schulenberg * src/winio.c (statusbar): Don't bother putting back the cursor in diff --git a/src/proto.h b/src/proto.h index 33972908..a8bca721 100644 --- a/src/proto.h +++ b/src/proto.h @@ -606,8 +606,8 @@ ssize_t do_replace_loop( #ifndef DISABLE_SPELLER bool whole_word_only, #endif - bool *canceled, const filestruct *real_current, size_t - *real_current_x, const char *needle); + const filestruct *real_current, size_t *real_current_x, + const char *needle); void do_replace(void); void goto_line_posx(ssize_t line, size_t pos_x); void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer, diff --git a/src/search.c b/src/search.c index 7c85da38..392183fe 100644 --- a/src/search.c +++ b/src/search.c @@ -611,8 +611,8 @@ ssize_t do_replace_loop( #ifndef DISABLE_SPELLER bool whole_word_only, #endif - bool *canceled, const filestruct *real_current, size_t - *real_current_x, const char *needle) + const filestruct *real_current, size_t *real_current_x, + const char *needle) { ssize_t numreplaced = -1; size_t match_len; @@ -642,9 +642,6 @@ ssize_t do_replace_loop( } #endif /* !NANO_TINY */ - if (canceled != NULL) - *canceled = FALSE; - findnextstr_wrap_reset(); while (findnextstr( #ifndef DISABLE_SPELLER @@ -690,11 +687,8 @@ ssize_t do_replace_loop( free(exp_word); - if (i == -1) { /* We canceled the replace. */ - if (canceled != NULL) - *canceled = TRUE; + if (i == -1) /* The replacing was cancelled. */ break; - } } if (i > 0 || replaceall) { /* Yes, replace it!!!! */ @@ -860,7 +854,7 @@ void do_replace(void) #ifndef DISABLE_SPELLER FALSE, #endif - NULL, begin, &begin_x, last_search); + begin, &begin_x, last_search); /* Restore where we were. */ openfile->edittop = edittop_save; diff --git a/src/text.c b/src/text.c index 0a93a15e..fc1f2a18 100644 --- a/src/text.c +++ b/src/text.c @@ -2448,7 +2448,7 @@ bool do_int_spell_fix(const char *word) if (!canceled && strcmp(word, answer) != 0) { openfile->current_x--; - do_replace_loop(TRUE, NULL, openfile->current, + do_replace_loop(TRUE, openfile->current, &openfile->current_x, word); }