Răsfoiți Sursa

temperature: OS split

Quentin Rameau 7 ani în urmă
părinte
comite
71eb1d321d
3 a modificat fișierele cu 17 adăugiri și 15 ștergeri
  1. 1 1
      Makefile
  2. 15 0
      components/Linux/temperature.c
  3. 1 14
      components/OpenBSD/temperature.c

+ 1 - 1
Makefile

@@ -21,7 +21,7 @@ COM =\
 	components/$(OS)/ram \
 	components/run_command\
 	components/$(OS)/swap \
-	components/temperature\
+	components/$(OS)/temperature \
 	components/uptime\
 	components/user\
 	components/volume\

+ 15 - 0
components/Linux/temperature.c

@@ -0,0 +1,15 @@
+/* See LICENSE file for copyright and license details. */
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "../../util.h"
+
+const char *
+temp(const char *file)
+{
+	int temp;
+
+	return (pscanf(file, "%d", &temp) == 1) ?
+	       bprintf("%d", temp / 1000) : NULL;
+}

+ 1 - 14
components/temperature.c → components/OpenBSD/temperature.c

@@ -2,24 +2,12 @@
 #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 "../util.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)
 {
@@ -42,4 +30,3 @@ temp(const char *null)
 
 	return bprintf("%d", (temp.value - 273150000) / 1000000); /* kelvin to celsius */
 }
-#endif