X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fapple_sensors.c;h=ad6e6c039b9b1435564702272074f837247646b4;hp=2f8cccd875c54e46011f2965ea714dc97195c0b8;hb=54619dc85fd308b21ed09a0271e5c7383c7921b9;hpb=e37e426d6646d6ff99834461f00c3dd79fa85d43 diff --git a/src/apple_sensors.c b/src/apple_sensors.c index 2f8cccd8..ad6e6c03 100644 --- a/src/apple_sensors.c +++ b/src/apple_sensors.c @@ -26,12 +26,8 @@ #include "collectd.h" -#include "common.h" #include "plugin.h" - -#if HAVE_CTYPE_H -#include -#endif +#include "utils/common/common.h" #if HAVE_MACH_MACH_TYPES_H #include @@ -69,10 +65,10 @@ static int as_init(void) { if (status != kIOReturnSuccess) { ERROR("IOMasterPort failed: %s", mach_error_string(status)); io_master_port = MACH_PORT_NULL; - return (-1); + return -1; } - return (0); + return 0; } static void as_submit(const char *type, const char *type_instance, double val) { @@ -99,13 +95,13 @@ static int as_read(void) { int value_int; double value_double; if (!io_master_port || (io_master_port == MACH_PORT_NULL)) - return (-1); + return -1; status = IOServiceGetMatchingServices( io_master_port, IOServiceNameMatching("IOHWSensor"), &iterator); if (status != kIOReturnSuccess) { ERROR("IOServiceGetMatchingServices failed: %s", mach_error_string(status)); - return (-1); + return -1; } while ((io_obj = IOIteratorNext(iterator))) { @@ -188,7 +184,7 @@ static int as_read(void) { IOObjectRelease(iterator); - return (0); + return 0; } /* int as_read */ void module_register(void) {