Change uint64_t to uintmax_t

[slstatus.git] / components / temperature.c

diff --git a/components/temperature.c b/components/temperature.c
index 35bdb01..71e1378 100644 (file)
--- a/components/temperature.c
+++ b/components/temperature.c
@@ -4,24 +4,27 @@
 #include "../util.h"
 
 #if defined(__linux__)
+       #include <inttypes.h>
+
        const char *
        temp(const char *file)
        {
-               int temp;
+               uintmax_t temp;
+
+               if(pscanf(file, "%" PRIuMAX, &temp) != 1) {
+                       return NULL;
+               }
 
-               return (pscanf(file, "%d", &temp) == 1) ?
-                      bprintf("%d", temp / 1000) : NULL;
+               return bprintf("%" PRIuMAX, temp / 1000);
        }
 #elif defined(__OpenBSD__)
-       #include <errno.h>
        #include <stdio.h>
-       #include <string.h>
        #include <sys/time.h> /* before <sys/sensors.h> for struct timeval */
        #include <sys/sensors.h>
        #include <sys/sysctl.h>
 
        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