X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fapple_sensors.c;h=bdba0ff85287745c960c1e5399d813aad2c116e2;hb=c4e824e456a30e1dc8f750a425472a0955f6b646;hp=33660a92e5268e4e71a9ea31aa87c1348718ea12;hpb=cb7fed8bf0af2646dfcb32844933398c28e39be5;p=collectd.git

diff --git a/src/apple_sensors.c b/src/apple_sensors.c
index 33660a92..bdba0ff8 100644
--- a/src/apple_sensors.c
+++ b/src/apple_sensors.c
@@ -22,7 +22,6 @@
 #include "collectd.h"
 #include "common.h"
 #include "plugin.h"
-#include "utils_debug.h"
 
 #if HAVE_CTYPE_H
 #  include <ctype.h>
@@ -50,37 +49,8 @@
 #  include <IOKit/IOTypes.h>
 #endif
 
-#if HAVE_IOKIT_IOKITLIB_H
-# define IOKIT_HAVE_READ 1
-#else
-# define IOKIT_HAVE_READ 0
-#endif
-
-#if HAVE_IOKIT_IOKITLIB_H
 static mach_port_t io_master_port = MACH_PORT_NULL;
-#endif
-
-static data_source_t data_source_fanspeed[1] =
-{
-	{"value", DS_TYPE_GAUGE, 0, NAN}
-};
 
-static data_set_t fanspeed_ds =
-{
-	"fanspeed", 1, data_source_fanspeed
-};
-
-static data_source_t data_source_temperature[1] =
-{
-	{"value", DS_TYPE_GAUGE, -273.15, NAN}
-};
-
-static data_set_t temperature_ds =
-{
-	"temperature", 1, data_source_temperature
-};
-
-#if IOKIT_HAVE_READ
 static int as_init (void)
 {
 	kern_return_t status;
@@ -95,7 +65,7 @@ static int as_init (void)
 	status = IOMasterPort (MACH_PORT_NULL, &io_master_port);
 	if (status != kIOReturnSuccess)
 	{
-		syslog (LOG_ERR, "IOMasterPort failed: %s",
+		ERROR ("IOMasterPort failed: %s",
 				mach_error_string (status));
 		io_master_port = MACH_PORT_NULL;
 		return (-1);
@@ -110,20 +80,20 @@ static void as_submit (const char *type, const char *type_instance,
 	value_t values[1];
 	value_list_t vl = VALUE_LIST_INIT;
 
-	DBG ("type = %s; type_instance = %s; val = %f;",
+	DEBUG ("type = %s; type_instance = %s; val = %f;",
 			type, type_instance, val);
 
 	values[0].gauge = val;
 
 	vl.values = values;
 	vl.values_len = 1;
-	vl.time = time (NULL);
-	strcpy (vl.host, hostname);
-	strcpy (vl.plugin, "apple_sensors");
-	strcpy (vl.plugin_instance, "");
-	strcpy (vl.type_instance, type_instance);
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "apple_sensors", sizeof (vl.plugin));
+	sstrncpy (vl.plugin_instance, "", sizeof (vl.plugin_instance));
+	sstrncpy (vl.type, type, sizeof (vl.type));
+	sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
 
-	plugin_dispatch_values (type, &vl);
+	plugin_dispatch_values (&vl);
 }
 
 static int as_read (void)
@@ -148,7 +118,7 @@ static int as_read (void)
 		       	&iterator);
 	if (status != kIOReturnSuccess)
        	{
-		syslog (LOG_ERR, "IOServiceGetMatchingServices failed: %s",
+		ERROR ("IOServiceGetMatchingServices failed: %s",
 				mach_error_string (status));
 		return (-1);
 	}
@@ -162,7 +132,7 @@ static int as_read (void)
 				kNilOptions);
 		if (status != kIOReturnSuccess)
 		{
-			DBG ("IORegistryEntryCreateCFProperties failed: %s",
+			DEBUG ("IORegistryEntryCreateCFProperties failed: %s",
 					mach_error_string (status));
 			continue;
 		}
@@ -176,10 +146,10 @@ static int as_read (void)
 		if (CFGetTypeID (property) != CFStringGetTypeID ())
 			continue;
 		if (!CFStringGetCString (property,
-					type, 128,
+					type, sizeof (type),
 					kCFStringEncodingASCII))
 			continue;
-		type[127] = '\0';
+		type[sizeof (type) - 1] = '\0';
 
 		/* Copy the sensor location. This will be used as `instance'. */
 		property = NULL;
@@ -190,10 +160,10 @@ static int as_read (void)
 		if (CFGetTypeID (property) != CFStringGetTypeID ())
 			continue;
 		if (!CFStringGetCString (property,
-					inst, 128,
+					inst, sizeof (inst),
 					kCFStringEncodingASCII))
 			continue;
-		inst[127] = '\0';
+		inst[sizeof (inst) - 1] = '\0';
 		for (i = 0; i < 128; i++)
 		{
 			if (inst[i] == '\0')
@@ -222,17 +192,17 @@ static int as_read (void)
 		if (strcmp (type, "temperature") == 0)
 		{
 			value_double = ((double) value_int) / 65536.0;
-			strcpy (type, "temperature");
+			sstrncpy (type, "temperature", sizeof (type));
 		}
 		else if (strcmp (type, "temp") == 0)
 		{
 			value_double = ((double) value_int) / 10.0;
-			strcpy (type, "temperature");
+			sstrncpy (type, "temperature", sizeof (type));
 		}
 		else if (strcmp (type, "fanspeed") == 0)
 		{
 			value_double = ((double) value_int) / 65536.0;
-			strcpy (type, "fanspeed");
+			sstrncpy (type, "fanspeed", sizeof (type));
 		}
 		else if (strcmp (type, "voltage") == 0)
 		{
@@ -242,11 +212,11 @@ static int as_read (void)
 		else if (strcmp (type, "adc") == 0)
 		{
 			value_double = ((double) value_int) / 10.0;
-			strcpy (type, "fanspeed");
+			sstrncpy (type, "fanspeed", sizeof (type));
 		}
 		else
 		{
-			DBG ("apple_sensors: Read unknown sensor type: %s",
+			DEBUG ("apple_sensors: Read unknown sensor type: %s",
 					type);
 			value_double = (double) value_int;
 		}
@@ -261,15 +231,9 @@ static int as_read (void)
 
 	return (0);
 } /* int as_read */
-#endif /* IOKIT_HAVE_READ */
 
 void module_register (void)
 {
-	plugin_register_data_set (&fanspeed_ds);
-	plugin_register_data_set (&temperature_ds);
-
-#if IOKIT_HAVE_READ
 	plugin_register_init ("apple_sensors", as_init);
 	plugin_register_read ("apple_sensors", as_read);
-#endif /* IOKIT_HAVE_READ */
-}
+} /* void module_register */