X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/b759662983a159da8a3c361f4f222287b2e43331..fa7c266e2b7adbc2a87bd44057b9e561d9ed61e3:/components/temperature.c

diff --git a/components/temperature.c b/components/temperature.c
index 812ae77..fe2e0c9 100644
--- a/components/temperature.c
+++ b/components/temperature.c
@@ -9,13 +9,14 @@
 	{
 		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>
 	#include <sys/time.h> /* before <sys/sensors.h> for struct timeval */
 	#include <sys/sensors.h>
 	#include <sys/sysctl.h>
@@ -36,12 +37,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