X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/a37224bf7b7eed62ff7574cc667202e905fc0d43..74c4f4ebdae8a12fc95840954dde574692234b01:/components/netspeeds.c

diff --git a/components/netspeeds.c b/components/netspeeds.c
index 5af5a94..32e78d6 100644
--- a/components/netspeeds.c
+++ b/components/netspeeds.c
@@ -17,14 +17,17 @@
 
 		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;
 		}
 
-		return oldrxbytes ? fmt_scaled((rxbytes - oldrxbytes) /
-		                               interval * 1000) : NULL;
+		return oldrxbytes ? fmt_scaled((rxbytes - oldrxbytes) *
+		                               1000 / interval) : NULL;
 	}
 
 	const char *
@@ -37,14 +40,17 @@
 
 		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;
 		}
 
-		return oldtxbytes ? fmt_scaled((txbytes - oldtxbytes) /
-		                               interval * 1000) : NULL;
+		return oldtxbytes ? fmt_scaled((txbytes - oldtxbytes) *
+		                               1000 / interval) : NULL;
 	}
 #elif defined(__OpenBSD__)
 	#include <string.h>
@@ -61,13 +67,15 @@
 		uint64_t oldrxbytes;
 		static uint64_t rxbytes = 0;
 		extern const unsigned int interval;
-		char if_ok = 0;
+		int if_ok = 0;
+
+		oldrxbytes = rxbytes;
 
 		if (getifaddrs(&ifal) == -1) {
 			warn("getifaddrs failed");
 			return NULL;
 		}
-		oldrxbytes = rxbytes;
+		rxbytes = 0;
 		for (ifa = ifal; ifa; ifa = ifa->ifa_next) {
 			if (!strcmp(ifa->ifa_name, interface) &&
 			   (ifd = (struct if_data *)ifa->ifa_data)) {
@@ -80,8 +88,8 @@
 			return NULL;
 		}
 
-		return oldrxbytes ? fmt_scaled((rxbytes - oldrxbytes) /
-		                               interval * 1000) : NULL;
+		return oldrxbytes ? fmt_scaled((rxbytes - oldrxbytes) *
+		                               1000 / interval) : NULL;
 	}
 
 	const char *
@@ -92,13 +100,15 @@
 		uint64_t oldtxbytes;
 		static uint64_t txbytes = 0;
 		extern const unsigned int interval;
-		char if_ok = 0;
+		int if_ok = 0;
+
+		oldtxbytes = txbytes;
 
 		if (getifaddrs(&ifal) == -1) {
 			warn("getifaddrs failed");
 			return NULL;
 		}
-		oldtxbytes = txbytes;
+		txbytes = 0;
 		for (ifa = ifal; ifa; ifa = ifa->ifa_next) {
 			if (!strcmp(ifa->ifa_name, interface) &&
 			   (ifd = (struct if_data *)ifa->ifa_data)) {
@@ -111,7 +121,7 @@
 			return NULL;
 		}
 
-		return oldtxbytes ? fmt_scaled((txbytes - oldtxbytes) /
-		                               interval * 1000) : NULL;
+		return oldtxbytes ? fmt_scaled((txbytes - oldtxbytes) *
+		                               1000 / interval) : NULL;
 	}
 #endif