tweaks: rename a variable, to match the style of its brothers

master
Benno Schulenberg 2019-05-30 19:34:57 +02:00
parent 477ff49f66
commit e1c011c9a1
1 changed files with 4 additions and 4 deletions

View File

@ -3027,7 +3027,7 @@ void do_linter(void)
void do_wordlinechar_count(void) void do_wordlinechar_count(void)
{ {
size_t words = 0, chars = 0; size_t words = 0, chars = 0;
ssize_t nlines = 0; ssize_t lines = 0;
size_t current_x_save = openfile->current_x; size_t current_x_save = openfile->current_x;
linestruct *current_save = openfile->current; linestruct *current_save = openfile->current;
linestruct *was_mark = openfile->mark; linestruct *was_mark = openfile->mark;
@ -3060,7 +3060,7 @@ void do_wordlinechar_count(void)
/* Get the total line and character counts, as "wc -l" and "wc -c" /* Get the total line and character counts, as "wc -l" and "wc -c"
* do, but get the latter in multibyte characters. */ * do, but get the latter in multibyte characters. */
if (was_mark) { if (was_mark) {
nlines = openfile->filebot->lineno - openfile->filetop->lineno + 1; lines = openfile->filebot->lineno - openfile->filetop->lineno + 1;
chars = get_totsize(openfile->filetop, openfile->filebot); chars = get_totsize(openfile->filetop, openfile->filebot);
/* Unpartition the buffer so that it contains all the text /* Unpartition the buffer so that it contains all the text
@ -3068,7 +3068,7 @@ void do_wordlinechar_count(void)
unpartition_buffer(&filepart); unpartition_buffer(&filepart);
openfile->mark = was_mark; openfile->mark = was_mark;
} else { } else {
nlines = openfile->filebot->lineno; lines = openfile->filebot->lineno;
chars = openfile->totsize; chars = openfile->totsize;
} }
@ -3078,7 +3078,7 @@ void do_wordlinechar_count(void)
/* 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"), was_mark ? statusline(HUSH, _("%sWords: %zu Lines: %zd Chars: %zu"), was_mark ?
_("In Selection: ") : "", words, nlines, chars); _("In Selection: ") : "", words, lines, chars);
} }
#endif /* !NANO_TINY */ #endif /* !NANO_TINY */