X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/66a7fb16fc903ac7ef6ce1acdbb353f1072cd0ec..06d4447f03669b72a885a997b666e4cbcc6b5ed1:/components/cpu.c

diff --git a/components/cpu.c b/components/cpu.c
index c8299f9..60a7991 100644
--- a/components/cpu.c
+++ b/components/cpu.c
@@ -12,16 +12,15 @@
 		int freq;
 
 		return (pscanf("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq",
-		               "%i", &freq) == 1) ?
+		               "%d", &freq) == 1) ?
 		       bprintf("%d", (freq + 500) / 1000) : NULL;
 	}
 
 	const char *
 	cpu_perc(void)
 	{
-		int perc;
-		static long double a[7];
 		static int valid;
+		static long double a[7];
 		long double b[7];
 
 		memcpy(b, a, sizeof(b));
@@ -35,12 +34,11 @@
 			return NULL;
 		}
 
-		perc = 100 * ((b[0] + b[1] + b[2] + b[5] + b[6]) -
-		              (a[0] + a[1] + a[2] + a[5] + a[6])) /
-		             ((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);
+		return bprintf("%d", (int)(100 *
+		               ((b[0] + b[1] + b[2] + b[5] + b[6]) -
+		                (a[0] + a[1] + a[2] + a[5] + a[6])) /
+		               ((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]))));
 	}
 #elif defined(__OpenBSD__)
 	#include <sys/param.h>
@@ -58,9 +56,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) {
+			warn("sysctl 'HW_CPUSPEED':");
 			return NULL;
 		}
 
@@ -70,7 +67,7 @@
 	const char *
 	cpu_perc(void)
 	{
-		int mib[2], perc;
+		int mib[2];
 		static int valid;
 		static long int a[CPUSTATES];
 		long int b[CPUSTATES];
@@ -82,8 +79,8 @@
 		size = sizeof(a);
 
 		memcpy(b, a, sizeof(b));
-		if (sysctl(mib, 2, &a, &size, NULL, 0) == -1) {
-			fprintf(stderr, "sysctl 'KERN_CPTIME': %s\n", strerror(errno));
+		if (sysctl(mib, 2, &a, &size, NULL, 0) < 0) {
+			warn("sysctl 'KERN_CPTIME':");
 			return NULL;
 		}
 		if (!valid) {
@@ -91,12 +88,12 @@
 			return NULL;
 		}
 
-		perc = 100 *
-		      ((a[CP_USER] + a[CP_NICE] + a[CP_SYS] + a[CP_INTR]) -
-		       (b[CP_USER] + b[CP_NICE] + b[CP_SYS] + b[CP_INTR])) /
-		      ((a[CP_USER] + a[CP_NICE] + a[CP_SYS] + a[CP_INTR] + a[CP_IDLE]) -
-		       (b[CP_USER] + b[CP_NICE] + b[CP_SYS] + b[CP_INTR] + b[CP_IDLE]));
-
-		return bprintf("%d", perc);
+		return bprintf("%d", 100 *
+		               ((a[CP_USER] + a[CP_NICE] + a[CP_SYS] + a[CP_INTR]) -
+		                (b[CP_USER] + b[CP_NICE] + b[CP_SYS] + b[CP_INTR])) /
+		               ((a[CP_USER] + a[CP_NICE] + a[CP_SYS] + a[CP_INTR] +
+		                 a[CP_IDLE]) -
+		                (b[CP_USER] + b[CP_NICE] + b[CP_SYS] + b[CP_INTR] +
+		                 b[CP_IDLE])));
 	}
 #endif