temperature: OS split

diff --git a/Makefile b/Makefile
index 5dcef0f76480ef5da184ed06631395729c6671e3..c06e81d3c2fe36f4b3ffef88934cbd0948740628 100644 (file)
--- a/Makefile
+++ b/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\

diff --git a/components/Linux/temperature.c b/components/Linux/temperature.c
new file mode 100644 (file)
index 0000000..fa50826
--- /dev/null
+++ b/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;
+}

diff --git a/components/temperature.c b/components/OpenBSD/temperature.c
similarity index 71%
rename from components/temperature.c
rename to components/OpenBSD/temperature.c
index e2c6a77ac769ae82a5c450e3b6baca821113c169..80988689c3a2b03b88a63647b0308b726d2fb870 100644 (file)
--- a/components/temperature.c
+++ b/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