[hackers] [PATCH 7/9] temperature: OS split

From: Quentin Rameau <quinq_AT_fifth.space>
Date: Mon, 30 Apr 2018 15:14:37 +0200

---
 Makefile                               |  2 +-
 components/Linux/temperature.c         | 15 +++++++++++++++
 components/{ => OpenBSD}/temperature.c | 15 +--------------
 3 files changed, 17 insertions(+), 15 deletions(-)
 create mode 100644 components/Linux/temperature.c
 rename components/{ => OpenBSD}/temperature.c (71%)
diff --git a/Makefile b/Makefile
index 5dcef0f..c06e81d 100644
--- a/Makefile
+++ b/Makefile
_AT_@ -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
index 0000000..fa50826
--- /dev/null
+++ b/components/Linux/temperature.c
_AT_@ -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 e2c6a77..8098868 100644
--- a/components/temperature.c
+++ b/components/OpenBSD/temperature.c
_AT_@ -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)
 {
_AT_@ -42,4 +30,3 @@ temp(const char *null)
 
 	return bprintf("%d", (temp.value - 273150000) / 1000000); /* kelvin to celsius */
 }
-#endif
-- 
2.16.2
Received on Mon Apr 30 2018 - 15:14:37 CEST

This archive was generated by hypermail 2.3.0 : Mon Apr 30 2018 - 15:25:30 CEST