From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Tue, 23 Jun 2020 01:13:55 +0000 (+0200)
Subject: randomconfig fixes
X-Git-Tag: 1_32_0~10
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=df1f479fc5167d6fa82b127c91a3851c0035fcac;p=oweals%2Fbusybox.git

randomconfig fixes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/networking/brctl.c b/networking/brctl.c
index 68725f93c..2f4ac4a87 100644
--- a/networking/brctl.c
+++ b/networking/brctl.c
@@ -107,7 +107,7 @@ static unsigned str_to_jiffies(const char *time_str)
 
 #define filedata bb_common_bufsiz1
 
-#if ENABLE_FEATURE_BRCTL_SHOW
+#if ENABLE_FEATURE_BRCTL_SHOW || ENABLE_FEATURE_BRCTL_FANCY
 static int read_file(const char *name)
 {
 	int n = open_read_close(name, filedata, COMMON_BUFSIZE - 1);
@@ -120,7 +120,9 @@ static int read_file(const char *name)
 	}
 	return n;
 }
+#endif
 
+#if ENABLE_FEATURE_BRCTL_SHOW
 /* NB: we are in /sys/class/net
  */
 static int show_bridge(const char *name, int need_hdr)
diff --git a/procps/top.c b/procps/top.c
index 5c41e8e10..8d39526ff 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -979,9 +979,11 @@ static unsigned handle_input(unsigned scan_mask, duration_t interval)
 		IF_FEATURE_TOPMEM(&& scan_mask != TOPMEM_MASK)
 		) {
 			scan_mask ^= PSSCAN_TASKS;
+#  if ENABLE_FEATURE_TOP_CPU_USAGE_PERCENTAGE
 			free(prev_hist);
 			prev_hist = NULL;
 			prev_hist_count = 0;
+#   endif
 			continue;
 		}
 # endif