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

top: make 'utf8_justify' independent of non-utf8 logic

Browse Source 
By eliminating the call to 'fmtmk', the 'utf8_justify'
function could more easily be used in libproc someday.

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

8
top/top.c
View File

@ -706,11 +706,11 @@ static int utf8_embody (const char *str, int width) {
static const char *utf8_justify (const char *str, int width, int justr) { static const char *utf8_justify (const char *str, int width, int justr) {
static char l_fmt[] = "%-*.*s%s", r_fmt[] = "%*.*s%s"; static char l_fmt[] = "%-*.*s%s", r_fmt[] = "%*.*s%s";
static char buf[SCREENMAX]; static char buf[SCREENMAX];
const char *p; char tmp[SCREENMAX];
p = fmtmk("%.*s", utf8_embody(str, width), str); snprintf(tmp, sizeof(tmp), "%.*s", utf8_embody(str, width), str);
width += utf8_delta(p); width += utf8_delta(tmp);
snprintf(buf, sizeof(buf), justr ? r_fmt : l_fmt, width, width, p, COLPADSTR); snprintf(buf, sizeof(buf), justr ? r_fmt : l_fmt, width, width, tmp, COLPADSTR);
return buf; return buf;
} // end: utf8_justify } // end: utf8_justify