Add basic backlight percentage support

[slstatus.git] / components / netspeeds.c

diff --git a/components/netspeeds.c b/components/netspeeds.c
index f0f7455..3c5dabf 100644 (file)
--- a/components/netspeeds.c
+++ b/components/netspeeds.c
@@ -11,7 +11,7 @@
        netspeed_rx(const char *interface)
        {
                uint64_t oldrxbytes;
        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];
 
                extern const unsigned int interval;
                char path[PATH_MAX];
 


@@ -29,15 +29,15 @@
                        return NULL;
                }
 
                        return NULL;
                }
 

-               return fmt_human_2((rxbytes - oldrxbytes) *
-                                  1000 / interval, "B/s");
+               return fmt_human((rxbytes - oldrxbytes) * 1000 / interval,
+                                1024);

        }
 
        const char *
        netspeed_tx(const char *interface)
        {
                uint64_t oldtxbytes;
        }
 
        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];
 
                extern const unsigned int interval;
                char path[PATH_MAX];
 


@@ -55,8 +55,8 @@
                        return NULL;
                }
 
                        return NULL;
                }
 

-               return fmt_human_2((txbytes - oldtxbytes) *
-                                  1000 / interval, "B/s");
+               return fmt_human((txbytes - oldtxbytes) * 1000 / interval,
+                                1024);

        }
 #elif defined(__OpenBSD__)
        #include <string.h>
        }
 #elif defined(__OpenBSD__)
        #include <string.h>


@@ -71,7 +71,7 @@
                struct ifaddrs *ifal, *ifa;
                struct if_data *ifd;
                uint64_t oldrxbytes;
                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;
 
                extern const unsigned int interval;
                int if_ok = 0;
 


@@ -97,8 +97,8 @@
                        return NULL;
                }
 
                        return NULL;
                }
 

-               return fmt_human_2((rxbytes - oldrxbytes) *
-                                  1000 / interval, "B/s");
+               return fmt_human((rxbytes - oldrxbytes) * 1000 / interval,
+                                1024);

        }
 
        const char *
        }
 
        const char *


@@ -107,7 +107,7 @@
                struct ifaddrs *ifal, *ifa;
                struct if_data *ifd;
                uint64_t oldtxbytes;
                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;
 
                extern const unsigned int interval;
                int if_ok = 0;
 


@@ -133,7 +133,7 @@
                        return NULL;
                }
 
                        return NULL;
                }
 

-               return fmt_human_2((txbytes - oldtxbytes) *
-                                  1000 / interval, "B/s");
+               return fmt_human((txbytes - oldtxbytes) * 1000 / interval,
+                                  1024);

        }
 #endif
        }
 #endif