tweaks: trim a displayable string in a more efficient manner

Instead of redetermining the entire span of the converted string,
simply move one character left, and then bite it off to make place
for the trailing $.
master
Benno Schulenberg 2017-03-14 21:11:51 +01:00
parent 0d9a734724
commit 5283acdcf3
1 changed files with 3 additions and 7 deletions

View File

@ -1925,16 +1925,12 @@ char *display_string(const char *buf, size_t start_col, size_t span,
buf += charlength + 7;
}
/* Null-terminate converted. */
converted[index] = '\0';
/* If there is more text than can be shown, make room for the $. */
if (*buf != '\0' && isdata && !ISSET(SOFTWRAP))
span--;
index = move_mbleft(converted, index);
/* Make sure converted takes up no more than span columns. */
index = actual_x(converted, span);
null_at(&converted, index);
/* Null-terminate the converted string. */
converted[index] = '\0';
return converted;
}