Use the sioctl_open(3) OpenBSD API to access vol

[slstatus.git] / components / netspeeds.c

diff --git a/components/netspeeds.c b/components/netspeeds.c
index 3c5dabf..0029177 100644 (file)
--- a/components/netspeeds.c
+++ b/components/netspeeds.c
@@ -10,8 +10,8 @@
        const char *
        netspeed_rx(const char *interface)
        {
        const char *
        netspeed_rx(const char *interface)
        {

-               uint64_t oldrxbytes;
-               static uint64_t rxbytes;
+               uintmax_t oldrxbytes;
+               static uintmax_t rxbytes;

                extern const unsigned int interval;
                char path[PATH_MAX];
 
                extern const unsigned int interval;
                char path[PATH_MAX];
 


@@ -22,7 +22,7 @@
                              interface) < 0) {
                        return NULL;
                }
                              interface) < 0) {
                        return NULL;
                }

-               if (pscanf(path, "%llu", &rxbytes) != 1) {
+               if (pscanf(path, "%ju", &rxbytes) != 1) {

                        return NULL;
                }
                if (oldrxbytes == 0) {
                        return NULL;
                }
                if (oldrxbytes == 0) {


@@ -36,8 +36,8 @@
        const char *
        netspeed_tx(const char *interface)
        {
        const char *
        netspeed_tx(const char *interface)
        {

-               uint64_t oldtxbytes;
-               static uint64_t txbytes;
+               uintmax_t oldtxbytes;
+               static uintmax_t txbytes;

                extern const unsigned int interval;
                char path[PATH_MAX];
 
                extern const unsigned int interval;
                char path[PATH_MAX];
 


@@ -48,7 +48,7 @@
                              interface) < 0) {
                        return NULL;
                }
                              interface) < 0) {
                        return NULL;
                }

-               if (pscanf(path, "%llu", &txbytes) != 1) {
+               if (pscanf(path, "%ju", &txbytes) != 1) {

                        return NULL;
                }
                if (oldtxbytes == 0) {
                        return NULL;
                }
                if (oldtxbytes == 0) {


@@ -58,7 +58,7 @@
                return fmt_human((txbytes - oldtxbytes) * 1000 / interval,
                                 1024);
        }
                return fmt_human((txbytes - oldtxbytes) * 1000 / interval,
                                 1024);
        }

-#elif defined(__OpenBSD__)
+#elif defined(__OpenBSD__) | defined(__FreeBSD__)

        #include <string.h>
        #include <ifaddrs.h>
        #include <sys/types.h>
        #include <string.h>
        #include <ifaddrs.h>
        #include <sys/types.h>


@@ -70,8 +70,8 @@
        {
                struct ifaddrs *ifal, *ifa;
                struct if_data *ifd;
        {
                struct ifaddrs *ifal, *ifa;
                struct if_data *ifd;

-               uint64_t oldrxbytes;
-               static uint64_t rxbytes;
+               uintmax_t oldrxbytes;
+               static uintmax_t rxbytes;

                extern const unsigned int interval;
                int if_ok = 0;
 
                extern const unsigned int interval;
                int if_ok = 0;
 


@@ -106,8 +106,8 @@
        {
                struct ifaddrs *ifal, *ifa;
                struct if_data *ifd;
        {
                struct ifaddrs *ifal, *ifa;
                struct if_data *ifd;

-               uint64_t oldtxbytes;
-               static uint64_t txbytes;
+               uintmax_t oldtxbytes;
+               static uintmax_t txbytes;

                extern const unsigned int interval;
                int if_ok = 0;
 
                extern const unsigned int interval;
                int if_ok = 0;
 


@@ -134,6 +134,6 @@
                }
 
                return fmt_human((txbytes - oldtxbytes) * 1000 / interval,
                }
 
                return fmt_human((txbytes - oldtxbytes) * 1000 / interval,

-                                  1024);
+                                1024);

        }
 #endif
        }
 #endif