Refactor entropy.c

[slstatus.git] / components / netspeeds.c

diff --git a/components/netspeeds.c b/components/netspeeds.c
index cd47dae..14b7799 100644 (file)
--- a/components/netspeeds.c
+++ b/components/netspeeds.c
@@ -11,40 +11,52 @@
        netspeed_rx(const char *interface)
        {
                uint64_t oldrxbytes;
-               static uint64_t rxbytes = 0;
+               static uint64_t rxbytes;
                extern const unsigned int interval;
                char path[PATH_MAX];
 
                oldrxbytes = rxbytes;
 
-               snprintf(path, sizeof(path),
-                        "/sys/class/net/%s/statistics/rx_bytes", interface);
+               if (esnprintf(path, sizeof(path),
+                             "/sys/class/net/%s/statistics/rx_bytes",
+                             interface) < 0) {
+                       return NULL;
+               }
                if (pscanf(path, "%llu", &rxbytes) != 1) {
                        return NULL;
                }
+               if (oldrxbytes == 0) {
+                       return NULL;
+               }
 
-               return oldrxbytes ? fmt_scaled((rxbytes - oldrxbytes) /
-                                              interval * 1000) : NULL;
+               return fmt_human_2((rxbytes - oldrxbytes) *
+                                  1000 / interval, "B/s");
        }
 
        const char *
        netspeed_tx(const char *interface)
        {
                uint64_t oldtxbytes;
-               static uint64_t txbytes = 0;
+               static uint64_t txbytes;
                extern const unsigned int interval;
                char path[PATH_MAX];
 
                oldtxbytes = txbytes;
 
-               snprintf(path, sizeof(path),
-                        "/sys/class/net/%s/statistics/tx_bytes", interface);
+               if (esnprintf(path, sizeof(path),
+                             "/sys/class/net/%s/statistics/tx_bytes",
+                             interface) < 0) {
+                       return NULL;
+               }
                if (pscanf(path, "%llu", &txbytes) != 1) {
                        return NULL;
                }
+               if (oldtxbytes == 0) {
+                       return NULL;
+               }
 
-               return oldtxbytes ? fmt_scaled((txbytes - oldtxbytes) /
-                                              interval * 1000) : NULL;
+               return fmt_human_2((txbytes - oldtxbytes) *
+                                  1000 / interval, "B/s");
        }
 #elif defined(__OpenBSD__)
        #include <string.h>
@@ -59,14 +71,17 @@
                struct ifaddrs *ifal, *ifa;
                struct if_data *ifd;
                uint64_t oldrxbytes;
-               static uint64_t rxbytes = 0;
+               static uint64_t rxbytes;
                extern const unsigned int interval;
-               char if_ok = 0;
+               int if_ok = 0;
+
+               oldrxbytes = rxbytes;
 
                if (getifaddrs(&ifal) == -1) {
                        warn("getifaddrs failed");
                        return NULL;
                }
+               rxbytes = 0;
                for (ifa = ifal; ifa; ifa = ifa->ifa_next) {
                        if (!strcmp(ifa->ifa_name, interface) &&
                           (ifd = (struct if_data *)ifa->ifa_data)) {
@@ -78,9 +93,12 @@
                        warn("reading 'if_data' failed");
                        return NULL;
                }
+               if (oldrxbytes == 0) {
+                       return NULL;
+               }
 
-               return oldrxbytes ? fmt_scaled((rxbytes - oldrxbytes) /
-                                              interval * 1000) : NULL;
+               return fmt_human_2((rxbytes - oldrxbytes) *
+                                  1000 / interval, "B/s");
        }
 
        const char *
@@ -89,14 +107,17 @@
                struct ifaddrs *ifal, *ifa;
                struct if_data *ifd;
                uint64_t oldtxbytes;
-               static uint64_t txbytes = 0;
+               static uint64_t txbytes;
                extern const unsigned int interval;
-               char if_ok = 0;
+               int if_ok = 0;
+
+               oldtxbytes = txbytes;
 
                if (getifaddrs(&ifal) == -1) {
                        warn("getifaddrs failed");
                        return NULL;
                }
+               txbytes = 0;
                for (ifa = ifal; ifa; ifa = ifa->ifa_next) {
                        if (!strcmp(ifa->ifa_name, interface) &&
                           (ifd = (struct if_data *)ifa->ifa_data)) {
@@ -108,8 +129,11 @@
                        warn("reading 'if_data' failed");
                        return NULL;
                }
+               if (oldtxbytes == 0) {
+                       return NULL;
+               }
 
-               return oldtxbytes ? fmt_scaled((txbytes - oldtxbytes) /
-                                              interval * 1000) : NULL;
+               return fmt_human_2((txbytes - oldtxbytes) *
+                                  1000 / interval, "B/s");
        }
 #endif