X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/489c6f87d1d19831a7d43840dd76b111d657750b..11ce8ed0136112138606895754297454f4601e67:/components/temperature.c?ds=sidebyside

diff --git a/components/temperature.c b/components/temperature.c
index a5df012..35bdb01 100644
--- a/components/temperature.c
+++ b/components/temperature.c
@@ -1,45 +1,47 @@
 /* See LICENSE file for copyright and license details. */
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#if defined(__OpenBSD__)
-#include <sys/sysctl.h>
-#include <sys/time.h>
-#include <sys/sensors.h>
-#endif
+#include <stddef.h>
 
 #include "../util.h"
 
 #if defined(__linux__)
-const char *
-temp(const char *file)
-{
-	int temp;
-
-	return (pscanf(file, "%d", &temp) == 1) ?
-	       bprintf("%d", temp / 1000) : NULL;
-}
-#elif defined(__OpenBSD__)
-const char *
-temp(const char *null)
-{
-	int mib[5];
-	size_t size;
-	struct sensor temp;
-
-	mib[0] = CTL_HW;
-	mib[1] = HW_SENSORS;
-	mib[2] = 0; /* cpu0 */
-	mib[3] = SENSOR_TEMP;
-	mib[4] = 0; /* temp0 */
-
-	size = sizeof(temp);
-
-	if (sysctl(mib, 5, &temp, &sz, NULL, 0) == -1) {
-		fprintf(stderr, "sysctl 'SENSOR_TEMP': %s\n", strerror(errno));
-		return NULL;
+	const char *
+	temp(const char *file)
+	{
+		int temp;
+
+		return (pscanf(file, "%d", &temp) == 1) ?
+		       bprintf("%d", temp / 1000) : NULL;
 	}
+#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)
+	{
+		int mib[5];
+		size_t size;
+		struct sensor temp;
 
-	return bprintf("%d", (temp.value - 273150000) / 1000000); /* kelvin to celsius */
-}
+		mib[0] = CTL_HW;
+		mib[1] = HW_SENSORS;
+		mib[2] = 0; /* cpu0 */
+		mib[3] = SENSOR_TEMP;
+		mib[4] = 0; /* temp0 */
+
+		size = sizeof(temp);
+
+		if (sysctl(mib, 5, &temp, &size, NULL, 0) < 0) {
+			fprintf(stderr, "sysctl 'SENSOR_TEMP': %s\n",
+			        strerror(errno));
+			return NULL;
+		}
+
+		/* kelvin to celsius */
+		return bprintf("%d", (temp.value - 273150000) / 1000000);
+	}
 #endif