Remove units from numbers

[slstatus.git] / components / temperature.c

diff --git a/components/temperature.c b/components/temperature.c
index 1353993..4e27a9d 100644 (file)
--- a/components/temperature.c
+++ b/components/temperature.c
@@ -9,19 +9,22 @@
        {
                int temp;
 
        {
                int temp;
 

-               return (pscanf(file, "%d", &temp) == 1) ?
-                      bprintf("%d", temp / 1000) : NULL;
+               if(pscanf(file, "%d", &temp) != 1) {
+                       return NULL;
+               }
+
+               return bprintf("%d", temp / 1000);

        }
 #elif defined(__OpenBSD__)
        #include <errno.h>
        #include <stdio.h>
        #include <string.h>
        }
 #elif defined(__OpenBSD__)
        #include <errno.h>
        #include <stdio.h>
        #include <string.h>

-       #include <sys/sysctl.h>
-       #include <sys/time.h>
+       #include <sys/time.h> /* before <sys/sensors.h> for struct timeval */

        #include <sys/sensors.h>
        #include <sys/sensors.h>

+       #include <sys/sysctl.h>

 
        const char *
 
        const char *

-       temp(const char *null)
+       temp(const char *unused)

        {
                int mib[5];
                size_t size;
        {
                int mib[5];
                size_t size;


@@ -35,9 +38,8 @@
 
                size = sizeof(temp);
 
 
                size = sizeof(temp);
 

-               if (sysctl(mib, 5, &temp, &size, NULL, 0) == -1) {
-                       fprintf(stderr, "sysctl 'SENSOR_TEMP': %s\n",
-                               strerror(errno));
+               if (sysctl(mib, 5, &temp, &size, NULL, 0) < 0) {
+                       warn("sysctl 'SENSOR_TEMP':");

                        return NULL;
                }
 
                        return NULL;
                }