From 3b69883c072d3087e6bdb18ac4bd3f9292b9a63e Mon Sep 17 00:00:00 2001 From: Jim Warner Date: Mon, 23 Aug 2021 00:00:00 -0500 Subject: [PATCH] top: whack a label & branch in 'summary_show' function Catch-up with newlib, original commit message follows: ------------------------------------------------------ If there are zero numa nodes then the View_CPUNOD flag cannot possibly be set. So it was unnecessary to check both the numa total and View_CPUNOD in 'summary_show'. Signed-off-by: Jim Warner --- top/top.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/top/top.c b/top/top.c index 3d654b76..9762e092 100644 --- a/top/top.c +++ b/top/top.c @@ -6039,8 +6039,6 @@ static void summary_show (void) { cpus_refresh(); - if (!Numa_node_tot) goto numa_nope; - if (CHKw(w, View_CPUNOD)) { if (Numa_node_sel < 0) { // display the 1st /proc/stat line, then the nodes (if room) @@ -6074,11 +6072,11 @@ static void summary_show (void) { } } } - } else -numa_nope: - if (CHKw(w, View_CPUSUM)) { + + } else if (CHKw(w, View_CPUSUM)) { // display just the 1st /proc/stat line Msg_row += sum_tics(&Cpu_tics[smp_num_cpus], N_txt(WORD_allcpus_txt), 1); + } else { // display each cpu's states separately, screen height permitting... if (w->rc.combine_cpus) {