aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2015-01-05 18:39:23 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2015-01-05 18:39:23 +0100
commit1ec49732e2b477c45599f1a33953b4390e8c43e5 (patch)
tree02add593276da4506c44de99264cd32c80bc5321
parent75a1403f266098bc4a498140473e1007075f459d (diff)
downloadbusybox-w32-1ec49732e2b477c45599f1a33953b4390e8c43e5.tar.gz
busybox-w32-1ec49732e2b477c45599f1a33953b4390e8c43e5.tar.bz2
busybox-w32-1ec49732e2b477c45599f1a33953b4390e8c43e5.zip
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>
-rw-r--r--procps/mpstat.c8
1 files changed, 2 insertions, 6 deletions
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)
522 FILE *fp; 522 FILE *fp;
523 char buf[1024]; 523 char buf[1024];
524 524
525 fp = fopen_for_read(PROCFS_STAT); 525 fp = xfopen_for_read(PROCFS_STAT);
526 if (!fp)
527 return;
528 526
529 while (fgets(buf, sizeof(buf), fp)) { 527 while (fgets(buf, sizeof(buf), fp)) {
530 //bb_error_msg("/proc/stat:'%s'", buf); 528 //bb_error_msg("/proc/stat:'%s'", buf);
@@ -644,9 +642,7 @@ static void get_uptime(data_t *uptime)
644 char buf[sizeof(long)*3 * 2 + 4]; /* enough for long.long */ 642 char buf[sizeof(long)*3 * 2 + 4]; /* enough for long.long */
645 unsigned long uptime_sec, decimal; 643 unsigned long uptime_sec, decimal;
646 644
647 fp = fopen_for_read(PROCFS_UPTIME); 645 fp = xfopen_for_read(PROCFS_UPTIME);
648 if (!fp)
649 return;
650 if (fgets(buf, sizeof(buf), fp)) { 646 if (fgets(buf, sizeof(buf), fp)) {
651 if (sscanf(buf, "%lu.%lu", &uptime_sec, &decimal) == 2) { 647 if (sscanf(buf, "%lu.%lu", &uptime_sec, &decimal) == 2) {
652 *uptime = (data_t)uptime_sec * G.hz + decimal * G.hz / 100; 648 *uptime = (data_t)uptime_sec * G.hz + decimal * G.hz / 100;