top: eliminated unreferenced macros & an error message

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

diff --git a/top/top.c b/top/top.c
index 29875374e3efb6b1e6f4257cdebba9ef34112e35..aa31254dc7b5080c8bf71ae43184fdb9290ca13d 100644 (file)
--- a/top/top.c
+++ b/top/top.c
@@ -3563,7 +3563,6 @@ try_inspect_entries:
 
          if (fbuf[0] == '#' || fbuf[0] == '\n') continue;
          Inspect.tab = alloc_r(Inspect.tab, sizeof(struct I_ent) * (i + 1));
-         p = fmtmk(N_fmt(YINSP_rcfile_fmt), i +1);
 
          if (!(s = strtok(fbuf, "\t\n"))) { Rc_questions = 1; continue; }
          iT(type) = alloc_s(s);

diff --git a/top/top.h b/top/top.h
index 2a06e9ac5619afcb0ade730d54fa324a0dd8f366..263de6c25f63821121fff48dead63b9ea0cb9fdd 100644 (file)
--- a/top/top.h
+++ b/top/top.h
@@ -451,12 +451,6 @@ typedef struct WIN_t {
 #define FLDget(q,i)  ((FLG_t)((q)->rc.fieldscur[i] & 0x7f) - FLD_OFFSET)
 #define FLDtog(q,i)  ((q)->rc.fieldscur[i] ^= 0x80)
 #define FLDviz(q,i)  ((q)->rc.fieldscur[i] &  0x80)
-#define ENUchk(w,E)  (NULL != strchr((w)->rc.fieldscur, (E + FLD_OFFSET) | 0x80))
-#define ENUset(w,E)  do { char *t; \
-      if ((t = strchr((w)->rc.fieldscur, E + FLD_OFFSET))) \
-         *t = (E + FLD_OFFSET) | 0x80; \
-   /* else fieldscur char already has high bit on! */ \
-   } while (0)
 #define ENUviz(w,E)  (NULL != memchr((w)->procflgs, E, (w)->maxpflgs))
 #define ENUpos(w,E)  ((int)((FLG_t*)memchr((w)->pflgsall, E, (w)->totpflgs) - (w)->pflgsall))
 

diff --git a/top/top_nls.c b/top/top_nls.c
index db9692601424ad131980531206a34827ad756200..70aa306dc4df66ba5615727da7e169c935f29cea 100644 (file)
--- a/top/top_nls.c
+++ b/top/top_nls.c
@@ -444,7 +444,6 @@ static void build_norm_nlstab (void) {
    Norm_nlstab[YINSP_failed_fmt] = _("Selection failed with: %s\n");
    Norm_nlstab[YINSP_pidbad_fmt] = _("unable to inspect, pid %d not found");
    Norm_nlstab[YINSP_pidsee_fmt] = _("inspect at PID [default pid = %d]");
-   Norm_nlstab[YINSP_rcfile_fmt] = _("could not parse rcfile inspect entry %d");
    Norm_nlstab[YINSP_status_fmt] = _("%s: %*d-%-*d lines, %*d-%*d columns, %lu bytes read");
    Norm_nlstab[YINSP_workin_txt] = _("patience please, working...");
 /* Translation Hint: Below are 2 abbreviations which can be as long as needed:

diff --git a/top/top_nls.h b/top/top_nls.h
index 27d857aac890eb8bef4c29ab233739129b211a49..1564ac823b4021163b29c3717e9049dec047d89c 100644 (file)
--- a/top/top_nls.h
+++ b/top/top_nls.h
@@ -90,7 +90,7 @@ enum norm_nls {
    YINSP_deqtyp_txt, YINSP_dstory_txt,
 #endif
    YINSP_failed_fmt, YINSP_noents_txt, YINSP_pidbad_fmt, YINSP_pidsee_fmt,
-   YINSP_rcfile_fmt, YINSP_status_fmt, YINSP_workin_txt,
+   YINSP_status_fmt, YINSP_workin_txt,
       norm_MAX
 };