Implement fmt_human_2() and fmt_human_10()

[slstatus.git] / components / netspeeds.c

diff --git a/components/netspeeds.c b/components/netspeeds.c
index b4e6972..f0f7455 100644 (file)
--- a/components/netspeeds.c
+++ b/components/netspeeds.c
@@ -17,14 +17,20 @@
 
                oldrxbytes = rxbytes;
 
 
                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 (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 *
        }
 
        const char *


@@ -37,14 +43,20 @@
 
                oldtxbytes = txbytes;
 
 
                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 (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>
        }
 #elif defined(__OpenBSD__)
        #include <string.h>


@@ -81,9 +93,12 @@
                        warn("reading 'if_data' failed");
                        return NULL;
                }
                        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 *
        }
 
        const char *


@@ -114,8 +129,11 @@
                        warn("reading 'if_data' failed");
                        return NULL;
                }
                        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
        }
 #endif