X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/ea2e2bd00403e02bee6298cfbb78eaa45869c851..e213b48122f1f8e8d837053324d9c891a67a38d2:/components/temperature.c diff --git a/components/temperature.c b/components/temperature.c index 35bdb01..d56cc0e 100644 --- a/components/temperature.c +++ b/components/temperature.c @@ -4,24 +4,27 @@ #include "../util.h" #if defined(__linux__) + #include + const char * temp(const char *file) { - int temp; + uintmax_t temp; + + if (pscanf(file, "%ju", &temp) != 1) { + return NULL; + } - return (pscanf(file, "%d", &temp) == 1) ? - bprintf("%d", temp / 1000) : NULL; + return bprintf("%ju", temp / 1000); } #elif defined(__OpenBSD__) - #include #include - #include #include /* before for struct timeval */ #include #include const char * - temp(const char *null) + temp(const char *unused) { int mib[5]; size_t size; @@ -36,12 +39,11 @@ size = sizeof(temp); if (sysctl(mib, 5, &temp, &size, NULL, 0) < 0) { - fprintf(stderr, "sysctl 'SENSOR_TEMP': %s\n", - strerror(errno)); + warn("sysctl 'SENSOR_TEMP':"); return NULL; } /* kelvin to celsius */ - return bprintf("%d", (temp.value - 273150000) / 1000000); + return bprintf("%d", (temp.value - 273150000) / 1E6); } #endif