tweaks: rename another variable, to be more fitting

master
Benno Schulenberg 2019-04-04 13:52:27 +02:00
parent 7bc324f276
commit a5869ba450
1 changed files with 5 additions and 5 deletions

View File

@ -1668,7 +1668,7 @@ size_t indent_length(const char *line)
void squeeze(linestruct *line, size_t skip) void squeeze(linestruct *line, size_t skip)
{ {
char *from, *to, *newdata; char *from, *to, *newdata;
size_t shift = 0; size_t shrunk = 0;
from = line->data + skip; from = line->data + skip;
newdata = charalloc(strlen(line->data) + 1); newdata = charalloc(strlen(line->data) + 1);
@ -1691,7 +1691,7 @@ void squeeze(linestruct *line, size_t skip)
charlen = parse_mbchar(from, NULL, NULL); charlen = parse_mbchar(from, NULL, NULL);
from += charlen; from += charlen;
shift += charlen; shrunk += charlen;
} }
/* If this character is punctuation optionally followed by a bracket /* If this character is punctuation optionally followed by a bracket
* and then followed by blanks, change no more than two of the blanks * and then followed by blanks, change no more than two of the blanks
@ -1737,7 +1737,7 @@ void squeeze(linestruct *line, size_t skip)
charlen = parse_mbchar(from, NULL, NULL); charlen = parse_mbchar(from, NULL, NULL);
from += charlen; from += charlen;
shift += charlen; shrunk += charlen;
} }
/* Leave unchanged anything that is neither blank nor punctuation. */ /* Leave unchanged anything that is neither blank nor punctuation. */
} else { } else {
@ -1757,10 +1757,10 @@ void squeeze(linestruct *line, size_t skip)
/* If there are spaces at the end of the line, remove them. */ /* If there are spaces at the end of the line, remove them. */
while (to > newdata + skip && *(to - 1) == ' ') { while (to > newdata + skip && *(to - 1) == ' ') {
to--; to--;
shift++; shrunk++;
} }
if (shift > 0) { if (shrunk > 0) {
null_at(&newdata, to - newdata); null_at(&newdata, to - newdata);
free(line->data); free(line->data);
line->data = newdata; line->data = newdata;