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

tweaks: elide a variable, drop a comment, and remove unneeded braces 

There is no need to save, clear, and restore the mark when counting
words, lines and characters, because partitioning and unpartitioning
the buffer does not use the mark nor affect it.
master
Benno Schulenberg 2019-05-31 17:34:22 +02:00
parent e98847200e
commit b9f994b2c0
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/text.c
View File

@ -3031,17 +3031,15 @@ void do_wordlinechar_count(void)
ssize_t lines = 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 *top, *bot; linestruct *top, *bot;
size_t top_x, bot_x; size_t top_x, bot_x;
/* If the mark is on, partition the buffer so that it /* If the mark is on, partition the buffer so that it
* contains only the marked text, and turn the mark off. */ * contains only the marked text, and turn the mark off. */
if (was_mark) { if (openfile->mark) {
get_region((const linestruct **)&top, &top_x, get_region((const linestruct **)&top, &top_x,
(const linestruct **)&bot, &bot_x, NULL); (const linestruct **)&bot, &bot_x, NULL);
filepart = partition_buffer(top, top_x, bot, bot_x); filepart = partition_buffer(top, top_x, bot, bot_x);
openfile->mark = NULL;
} }
/* Start at the top of the file. */ /* Start at the top of the file. */
@ -3063,23 +3061,18 @@ void do_wordlinechar_count(void)
((openfile->filebot->data[0] == '\0') ? 0 : 1); ((openfile->filebot->data[0] == '\0') ? 0 : 1);
/* Get the number of multibyte characters, similar to "wc -c". */ /* Get the number of multibyte characters, similar to "wc -c". */
if (was_mark) { if (openfile->mark) {
chars = get_totsize(openfile->filetop, openfile->filebot); chars = get_totsize(openfile->filetop, openfile->filebot);
/* Unpartition the buffer so that it contains all the text
* again, and turn the mark back on. */
unpartition_buffer(&filepart); unpartition_buffer(&filepart);
openfile->mark = was_mark; } else
} else {
chars = openfile->totsize; chars = openfile->totsize;
}
/* Restore where we were. */ /* Restore where we were. */
openfile->current = current_save; openfile->current = current_save;
openfile->current_x = current_x_save; openfile->current_x = current_x_save;
/* 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"), openfile->mark ?
_("In Selection: ") : "", words, lines, chars); _("In Selection: ") : "", words, lines, chars);
} }
#endif /* !NANO_TINY */ #endif /* !NANO_TINY */