From 73d83ec1c2940a0b64bd9ff624213dd8cb27d5c5 Mon Sep 17 00:00:00 2001 From: Jim Warner Date: Mon, 10 Dec 2012 00:00:00 -0600 Subject: [PATCH] top: add pseudo type to the inspect demo '=' provision When 'type' was added to the alternate status line for the '=' key, the need for the demonstration 'type' was overlooked. This commit avoids the '(null)' potential. (now that we know a '.' + 2 spaces is squeezed to one) (everything's perfectly justified, but it's just luck) Reference(s); commit 3b2b9a95e6ee628ac957851d8fa1cd343e8f0c01 Signed-off-by: Jim Warner --- top/top.c | 3 ++- top/top_nls.c | 3 ++- top/top_nls.h | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/top/top.c b/top/top.c index 082f7a51..14a6e374 100644 --- a/top/top.c +++ b/top/top.c @@ -3109,9 +3109,10 @@ try_inspect_entries: Inspect.total = Inspect.demo = MAXTBL(sels); Inspect.tab = alloc_c(sizeof(struct I_ent) * Inspect.total); for (i = 0; i < Inspect.total; i++) { + Inspect.tab[i].type = strdup(N_txt(YINSP_deqtyp_txt)); Inspect.tab[i].name = strdup(sels[i]); Inspect.tab[i].func = insp_do_demo; - Inspect.tab[i].fmts = strdup(N_txt(YINSP_deqkey_txt)); + Inspect.tab[i].fmts = strdup(N_txt(YINSP_deqfmt_txt)); Inspect.tab[i].fstr = alloc_c(FNDBUFSIZ); } #undef mkS diff --git a/top/top_nls.c b/top/top_nls.c index 56722e2e..16ce5fb8 100644 --- a/top/top_nls.c +++ b/top/top_nls.c @@ -373,7 +373,8 @@ static void build_norm_nlstab (void) { Norm_nlstab[YINSP_demo01_txt] = _("Open Files"); Norm_nlstab[YINSP_demo02_txt] = _("NUMA Info"); Norm_nlstab[YINSP_demo03_txt] = _("Log"); - Norm_nlstab[YINSP_deqkey_txt] = _("the '=' key will eventually show the actual file read or command(s) excuted ..."); + Norm_nlstab[YINSP_deqfmt_txt] = _("the '=' key will eventually show the actual file read or command(s) excuted ..."); + Norm_nlstab[YINSP_deqtyp_txt] = _("demo"); Norm_nlstab[YINSP_dstory_txt] = _("" "This is simulated output representing the contents of some file or the output\n" "from some command. Exactly which commands and/or files are solely up to you.\n" diff --git a/top/top_nls.h b/top/top_nls.h index 7f3ef727..6954c08a 100644 --- a/top/top_nls.h +++ b/top/top_nls.h @@ -85,8 +85,8 @@ enum norm_nls { XTRA_warncfg_txt, #endif #ifndef INSP_OFFDEMO - YINSP_demo01_txt, YINSP_demo02_txt, YINSP_demo03_txt, YINSP_deqkey_txt, - YINSP_dstory_txt, + YINSP_demo01_txt, YINSP_demo02_txt, YINSP_demo03_txt, YINSP_deqfmt_txt, + 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,