From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Mon, 5 Jan 2015 17:39:23 +0000 (+0100)
Subject: mpstat: code shrink
X-Git-Tag: 1_24_0~232
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1ec49732e2b477c45599f1a33953b4390e8c43e5;p=oweals%2Fbusybox.git

mpstat: code shrink

function                                             old     new   delta
get_uptime                                           134     129      -5
get_irqs_from_stat                                   110     103      -7

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

diff --git a/procps/mpstat.c b/procps/mpstat.c
index c628d6215..af3263d67 100644
--- a/procps/mpstat.c
+++ b/procps/mpstat.c
@@ -522,9 +522,7 @@ static void get_irqs_from_stat(struct stats_irq *irq)
 	FILE *fp;
 	char buf[1024];
 
-	fp = fopen_for_read(PROCFS_STAT);
-	if (!fp)
-		return;
+	fp = xfopen_for_read(PROCFS_STAT);
 
 	while (fgets(buf, sizeof(buf), fp)) {
 		//bb_error_msg("/proc/stat:'%s'", buf);
@@ -644,9 +642,7 @@ static void get_uptime(data_t *uptime)
 	char buf[sizeof(long)*3 * 2 + 4]; /* enough for long.long */
 	unsigned long uptime_sec, decimal;
 
-	fp = fopen_for_read(PROCFS_UPTIME);
-	if (!fp)
-		return;
+	fp = xfopen_for_read(PROCFS_UPTIME);
 	if (fgets(buf, sizeof(buf), fp)) {
 		if (sscanf(buf, "%lu.%lu", &uptime_sec, &decimal) == 2) {
 			*uptime = (data_t)uptime_sec * G.hz + decimal * G.hz / 100;