From: Jim Warner <james.warner@comcast.net>
Date: Fri, 27 May 2022 05:00:00 +0000 (-0500)
Subject: top: cleanup of miscellaneous stuff from prior commits
X-Git-Tag: v4.0.1rc1~61
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=daedcb97;p=procps-ng

top: cleanup of miscellaneous stuff from prior commits

Fix some errors introduced in the commits shown below.

Reference(s):
. Apr, 2022 - 'keys_global' missed redundancy
commit 27f5904edd3772a2f3f66ac62148dee636295933
. Apr, 2022 - added extraneous comma in help text
commit fb32021eeb6f78f01bf455231423a162c9766408

Signed-off-by: Jim Warner <james.warner@comcast.net>
---

diff --git a/top/top.c b/top/top.c
index b9c78193..4ffcccd1 100644
--- a/top/top.c
+++ b/top/top.c
@@ -5509,12 +5509,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 f54daa38..1619836b 100644
--- a/top/top_nls.c
+++ b/top/top_nls.c
@@ -729,7 +729,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