X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/b792b7ab69c24bedf8147c734a849ae0c54da1dc..c2492c3f99d9d434a6f935dea8e97fa27cdd2adc:/components/cpu.c?ds=sidebyside diff --git a/components/cpu.c b/components/cpu.c index e320ff6..14c8658 100644 --- a/components/cpu.c +++ b/components/cpu.c @@ -11,11 +11,11 @@ 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) { + "%" PRIuMAX, &freq) != 1) { return NULL; } @@ -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((size_t)freq * 1000 * 1000, 1000); + return fmt_human(freq * 1E6, 1000); } const char * cpu_perc(void) { int mib[2]; - static uint64_t a[CPUSTATES]; - uint64_t b[CPUSTATES]; + static uintmax_t a[CPUSTATES]; + uintmax_t b[CPUSTATES]; size_t size; mib[0] = CTL_KERN;