From 1a28b4cb8d56dc4d2df468500f926ae643393aec Mon Sep 17 00:00:00 2001 From: Jim Warner Date: Wed, 15 Jun 2022 00:00:00 -0500 Subject: [PATCH] top: cleanup of miscellaneous stuff from prior commits <=== port of newlib daedcb97 ______________________________ original newlib message ----------------------------------- ( minus git hash ) Fix some errors introduced in the commits shown below. Reference(s): . Apr, 2022 - 'keys_global' missed redundancy commit ........................................ . Apr, 2022 - added extraneous comma in help text commit ........................................ Signed-off-by: Jim Warner --- top/top.c | 7 +++---- top/top_nls.c | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/top/top.c b/top/top.c index cf8a09f3..f5ef6201 100644 --- a/top/top.c +++ b/top/top.c @@ -5667,12 +5667,11 @@ static void keys_global (int ch) { } break; case 'X': - { int wide = get_int(fmtmk(N_fmt(XTRA_fixwide_fmt), Rc.fixed_widest)); - if (wide > GET_NUM_NOT) { - if (wide >= 0 && wide <= SCREENMAX) Rc.fixed_widest = wide; + num = get_int(fmtmk(N_fmt(XTRA_fixwide_fmt), Rc.fixed_widest)); + if (num > GET_NUM_NOT) { + if (num >= 0 && num <= SCREENMAX) Rc.fixed_widest = num; else Rc.fixed_widest = -1; } - } break; case 'Y': if (!Inspect.total) diff --git a/top/top_nls.c b/top/top_nls.c index b835878d..f830cc62 100644 --- a/top/top_nls.c +++ b/top/top_nls.c @@ -662,7 +662,7 @@ static void build_uniq_nlstab (void) { . also imbedded in the translatable text (along with escape seqs) . should never themselves be translated. */ Uniq_nlstab[KEYS_helpext_fmt] = _("" - " d,k,r,^R, '~1d~2' set delay; '~1k~2' kill; '~1r~2' renice; ~1Ctrl~2+'~1R~2' renice autogroup\n"); + " d,k,r,^R '~1d~2' set delay; '~1k~2' kill; '~1r~2' renice; ~1Ctrl~2+'~1R~2' renice autogroup\n"); /* Translation Hint: . This Fields Management header should be 3 lines long so as