X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/b0401b13bb78bacde9d10b00766830cbeb2c90f6..e20b50112e01f92f7c302107b59b17d8cc28387a:/components/cpu.c diff --git a/components/cpu.c b/components/cpu.c index cd5ebe4..2c5e4dc 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; } @@ -45,6 +45,7 @@ (a[0] + a[1] + a[2] + a[3] + a[4] + a[5] + a[6])))); } #elif defined(__OpenBSD__) + #include #include #include #include @@ -52,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; @@ -66,15 +68,15 @@ return NULL; } - return fmt_human((size_t)freq * 1000 * 1000, 1000); + return fmt_human(freq * 1000 * 1000, 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;