From c75586f5238fb65708404641eb6cde6c1a403c84 Mon Sep 17 00:00:00 2001 From: Jim Warner Date: Mon, 30 Jun 2014 00:00:00 -0500 Subject: [PATCH] top: eliminated unreferenced macros & an error message Signed-off-by: Jim Warner --- top/top.c | 1 - top/top.h | 6 ------ top/top_nls.c | 1 - top/top_nls.h | 2 +- 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/top/top.c b/top/top.c index 29875374..aa31254d 100644 --- 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 2a06e9ac..263de6c2 100644 --- 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 db969260..70aa306d 100644 --- 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 27d857aa..1564ac82 100644 --- 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 };