emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

top: make that 'make_str_utf8' function more efficient

Browse Source 
Upon reflection, there was absolutely no justification
for that call to strlen() which was then followed by a
call to snprintf(). The latter provides this needed #.

[ also make that 'delta' value a little more visible ]
[ instead of hiding it at the end of a its code line ]

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2017-10-04 00:00:00 -05:00 committed by Craig Small
parent 6597ac227d
commit abde5d7d5e
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
top/top.c
View File

@ -1636,9 +1636,7 @@ static inline const char *make_str_utf8 (const char *str, int width, int justr,
static char buf[SCREENMAX]; static char buf[SCREENMAX];
int delta = utf8_delta(str); int delta = utf8_delta(str);
if (width >= (int)strlen(str) - delta) if (width + delta <= snprintf(buf, sizeof(buf), "%s", str)) {
snprintf(buf, sizeof(buf), "%s", str);
else {
snprintf(buf, sizeof(buf), "%.*s", utf8_embody(str, width - 1), str); snprintf(buf, sizeof(buf), "%.*s", utf8_embody(str, width - 1), str);
delta = utf8_delta(buf); delta = utf8_delta(buf);
buf[width + delta - 1] = COLPLUSCH; buf[width + delta - 1] = COLPLUSCH;