X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/ec5c35ec9f23254f09e734d0c1880559774dfa52..dd7f1896aa9883f33b4d28cd192e8088db0cab5a:/components/cpu.c

diff --git a/components/cpu.c b/components/cpu.c
index 3fadb36..d4f8064 100644
--- a/components/cpu.c
+++ b/components/cpu.c
@@ -1,26 +1,23 @@
 /* See LICENSE file for copyright and license details. */
-#include <errno.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 
 #include "../util.h"
 
 #if defined(__linux__)
-	#include <inttypes.h>
-	#include <stdint.h>
-
 	const char *
 	cpu_freq(void)
 	{
-		uint64_t freq;
+		uintmax_t freq;
 
 		/* in kHz */
-		if (pscanf("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq",
-		            "%"SCNu64, &freq) != 1) {
+		if (pscanf("/sys/devices/system/cpu/cpu0/cpufreq/"
+		           "scaling_cur_freq", "%ju", &freq) != 1) {
 			return NULL;
 		}
 
-		return fmt_human_10(freq * 1000);
+		return fmt_human(freq * 1000, 1000);
 	}
 
 	const char *
@@ -32,7 +29,8 @@
 		memcpy(b, a, sizeof(b));
 		/* cpu user nice system idle iowait irq softirq */
 		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) {
+		           &a[0], &a[1], &a[2], &a[3], &a[4], &a[5], &a[6])
+		    != 7) {
 			return NULL;
 		}
 		if (b[0] == 0) {
@@ -42,8 +40,10 @@
 		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]))));
+		               ((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>
@@ -53,7 +53,8 @@
 	const char *
 	cpu_freq(void)
 	{
-		int freq, mib[2];
+		int mib[2];
+		uintmax_t freq;
 		size_t size;
 
 		mib[0] = CTL_HW;
@@ -67,15 +68,15 @@
 			return NULL;
 		}
 
-		return fmt_human_10((size_t)freq * 1000 * 1000);
+		return fmt_human(freq * 1E6, 1000);
 	}
 
 	const char *
 	cpu_perc(void)
 	{
 		int mib[2];
-		static long int a[CPUSTATES];
-		long int b[CPUSTATES];
+		static uintmax_t a[CPUSTATES];
+		uintmax_t b[CPUSTATES];
 		size_t size;
 
 		mib[0] = CTL_KERN;
@@ -93,11 +94,13 @@
 		}
 
 		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])));
+		               ((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