all repos — slstatus @ 71eb1d321d1937b9fc96891fa47211a9e65a1e5e

my build of slstatus (tools.suckless.org/slstatus/)

temperature: OS split
Quentin Rameau quinq@fifth.space
Mon, 30 Apr 2018 15:14:37 +0200
commit

71eb1d321d1937b9fc96891fa47211a9e65a1e5e

parent

72f5a0d69ad43e7329064f415b4f8df3c1c2ccec

3 files changed, 17 insertions(+), 15 deletions(-)

jump to
M MakefileMakefile

@@ -21,7 +21,7 @@ components/num_files\

components/$(OS)/ram \ components/run_command\ components/$(OS)/swap \ - components/temperature\ + components/$(OS)/temperature \ components/uptime\ components/user\ components/volume\
A 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; +}
M components/temperature.ccomponents/OpenBSD/temperature.c

@@ -2,24 +2,12 @@ /* 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 "../util.h" -#if defined(__linux__) -const char * -temp(const char *file) -{ - int temp; +#include "../../util.h" - return (pscanf(file, "%d", &temp) == 1) ? - bprintf("%d", temp / 1000) : NULL; -} -#elif defined(__OpenBSD__) const char * temp(const char *null) {

@@ -42,4 +30,3 @@ }

return bprintf("%d", (temp.value - 273150000) / 1000000); /* kelvin to celsius */ } -#endif