Refactor entropy.c

[slstatus.git] / components / netspeeds.c

diff --git a/components/netspeeds.c b/components/netspeeds.c
index 32e78d6..14b7799 100644 (file)
--- a/components/netspeeds.c
+++ b/components/netspeeds.c
@@ -11,7 +11,7 @@
        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];
 
@@ -25,16 +25,19 @@
                if (pscanf(path, "%llu", &rxbytes) != 1) {
                        return NULL;
                }
+               if (oldrxbytes == 0) {
+                       return NULL;
+               }
 
-               return oldrxbytes ? fmt_scaled((rxbytes - oldrxbytes) *
-                                              1000 / interval) : 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];
 
@@ -48,9 +51,12 @@
                if (pscanf(path, "%llu", &txbytes) != 1) {
                        return NULL;
                }
+               if (oldtxbytes == 0) {
+                       return NULL;
+               }
 
-               return oldtxbytes ? fmt_scaled((txbytes - oldtxbytes) *
-                                              1000 / interval) : NULL;
+               return fmt_human_2((txbytes - oldtxbytes) *
+                                  1000 / interval, "B/s");
        }
 #elif defined(__OpenBSD__)
        #include <string.h>
@@ -65,7 +71,7 @@
                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;
                int if_ok = 0;
 
@@ -87,9 +93,12 @@
                        warn("reading 'if_data' failed");
                        return NULL;
                }
+               if (oldrxbytes == 0) {
+                       return NULL;
+               }
 
-               return oldrxbytes ? fmt_scaled((rxbytes - oldrxbytes) *
-                                              1000 / interval) : NULL;
+               return fmt_human_2((rxbytes - oldrxbytes) *
+                                  1000 / interval, "B/s");
        }
 
        const char *
@@ -98,7 +107,7 @@
                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;
                int if_ok = 0;
 
@@ -120,8 +129,11 @@
                        warn("reading 'if_data' failed");
                        return NULL;
                }
+               if (oldtxbytes == 0) {
+                       return NULL;
+               }
 
-               return oldtxbytes ? fmt_scaled((txbytes - oldtxbytes) *
-                                              1000 / interval) : NULL;
+               return fmt_human_2((txbytes - oldtxbytes) *
+                                  1000 / interval, "B/s");
        }
 #endif