X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/235fa3c3065a93d24efb06d0dc8a9fffae5d32cd..932f65c37388220298b44c65e601c593e4e40b9e:/components/cpu.c

diff --git a/components/cpu.c b/components/cpu.c
index 661c27c..3b29b8b 100644
--- a/components/cpu.c
+++ b/components/cpu.c
@@ -42,31 +42,6 @@
 
 		return bprintf("%d", perc);
 	}
-
-	const char *
-	cpu_iowait(void)
-	{
-		int perc;
-		static int valid;
-		static long double a[7];
-		long double b[7];
-
-		memcpy(b, a, sizeof(b));
-		if (pscanf("/proc/stat", "%*s %Lf %Lf %Lf %Lf %Lf %Lf %Lf",
-		           &a[0], &a[1], &a[2], &a[3], &a[4], &a[5], &a[6]) != 7) {
-			return NULL;
-		}
-		if (!valid) {
-			valid = 1;
-			return NULL;
-		}
-
-		perc = 100 * ((b[4]) - (a[4])) /
-		       ((b[0]+b[1]+b[2]+b[3]+b[4]+b[5]+b[6]) -
-		        (a[0]+a[1]+a[2]+a[3]+a[4]+a[5]+a[6]));
-
-		return bprintf("%d", perc);
-	}
 #elif defined(__OpenBSD__)
 	#include <sys/param.h>
 	#include <sys/sched.h>
@@ -83,9 +58,8 @@
 
 		size = sizeof(freq);
 
-		if (sysctl(mib, 2, &freq, &size, NULL, 0) == -1) {
-			fprintf(stderr, "sysctl 'HW_CPUSPEED': %s\n",
-			        strerror(errno));
+		if (sysctl(mib, 2, &freq, &size, NULL, 0) < 0) {
+			fprintf(stderr, "sysctl 'HW_CPUSPEED': %s\n", strerror(errno));
 			return NULL;
 		}
 
@@ -107,7 +81,7 @@
 		size = sizeof(a);
 
 		memcpy(b, a, sizeof(b));
-		if (sysctl(mib, 2, &a, &size, NULL, 0) == -1) {
+		if (sysctl(mib, 2, &a, &size, NULL, 0) < 0) {
 			fprintf(stderr, "sysctl 'KERN_CPTIME': %s\n", strerror(errno));
 			return NULL;
 		}