From 0f5d503103974d2ace7611f3277357803d391226 Mon Sep 17 00:00:00 2001 From: Jim Warner Date: Fri, 6 Oct 2017 00:00:00 -0500 Subject: [PATCH] top: make 'utf8_justify' independent of non-utf8 logic By eliminating the call to 'fmtmk', the 'utf8_justify' function could more easily be used in libproc someday. Signed-off-by: Jim Warner --- top/top.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/top/top.c b/top/top.c index 0020c2c4..79721fce 100644 --- a/top/top.c +++ b/top/top.c @@ -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 char l_fmt[] = "%-*.*s%s", r_fmt[] = "%*.*s%s"; static char buf[SCREENMAX]; - const char *p; + char tmp[SCREENMAX]; - p = fmtmk("%.*s", utf8_embody(str, width), str); - width += utf8_delta(p); - snprintf(buf, sizeof(buf), justr ? r_fmt : l_fmt, width, width, p, COLPADSTR); + snprintf(tmp, sizeof(tmp), "%.*s", utf8_embody(str, width), str); + width += utf8_delta(tmp); + snprintf(buf, sizeof(buf), justr ? r_fmt : l_fmt, width, width, tmp, COLPADSTR); return buf; } // end: utf8_justify