tweaks: rename two variables, and reshuffle their declarations

master
Benno Schulenberg 2019-05-31 17:45:51 +02:00
parent b9f994b2c0
commit 2e81023553
1 changed files with 4 additions and 4 deletions

View File

@ -3027,10 +3027,10 @@ void do_linter(void)
* multibyte characters instead of single-byte characters. */ * multibyte characters instead of single-byte characters. */
void do_wordlinechar_count(void) void do_wordlinechar_count(void)
{ {
linestruct *was_current = openfile->current;
size_t was_x = openfile->current_x;
size_t words = 0, chars = 0; size_t words = 0, chars = 0;
ssize_t lines = 0; ssize_t lines = 0;
size_t current_x_save = openfile->current_x;
linestruct *current_save = openfile->current;
linestruct *top, *bot; linestruct *top, *bot;
size_t top_x, bot_x; size_t top_x, bot_x;
@ -3068,8 +3068,8 @@ void do_wordlinechar_count(void)
chars = openfile->totsize; chars = openfile->totsize;
/* Restore where we were. */ /* Restore where we were. */
openfile->current = current_save; openfile->current = was_current;
openfile->current_x = current_x_save; openfile->current_x = was_x;
/* Display the total word, line, and character counts on the statusbar. */ /* Display the total word, line, and character counts on the statusbar. */
statusline(HUSH, _("%sWords: %zu Lines: %zd Chars: %zu"), openfile->mark ? statusline(HUSH, _("%sWords: %zu Lines: %zd Chars: %zu"), openfile->mark ?