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 <james.warner@comcast.net>

diff --git a/top/top.c b/top/top.c
index cf8a09f37b6f3d8efcc1c31d84cfd8de2a0a4f9b..f5ef62011bcc604ccb41c833d69f56b2393b3ce2 100644 (file)
--- 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 b835878d20ee7add87e73affc7413c5702b0200e..f830cc62d37155599a5ae9103850cb93bf3580b4 100644 (file)
--- 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