diff options
author | Laslo Hunhold <dev@frign.de> | 2018-05-01 19:01:22 +0200 |
---|---|---|
committer | Aaron Marcher <me@drkhsh.at> | 2018-05-01 19:43:49 +0200 |
commit | 9750a3d731cd381e832bcacf1d03e48ddb46cc16 (patch) | |
tree | d3b6d97ad8434a14e8fed7dfe3a2e733df4e05bb /components/temperature.c | |
parent | 42edfea89a47cbf0623d1aaf5673a4e5ca79fb52 (diff) |
Use indentation to increase readability
Granted, this style is definitely not common, but for the short
utility-functions of this program it's just the right choice. This
provides great flexibility, such that in the long run, it will be
possible to also share code between the OS-implementations.
This also keeps the state-keeping at a minimum and makes it clearer
which functions are implemented on which OS without having to jiggle
around with too many files in the process.
Diffstat (limited to 'components/temperature.c')
-rw-r--r-- | components/temperature.c | 76 |
1 files changed, 39 insertions, 37 deletions
diff --git a/components/temperature.c b/components/temperature.c index e2c6a77..1353993 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, &size, 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/sysctl.h> + #include <sys/time.h> + #include <sys/sensors.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) == -1) { + fprintf(stderr, "sysctl 'SENSOR_TEMP': %s\n", + strerror(errno)); + return NULL; + } + + /* kelvin to celsius */ + return bprintf("%d", (temp.value - 273150000) / 1000000); + } #endif |