X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fapple_sensors.c;h=ee0bf8c09da13b2fb84fd487c0f9d906bccba6d5;hb=49908d768d58345cd27bd2cf05f7c0c5f8b95a1e;hp=6b3cfc5e0bd13a926bd8465773b90058a56b0cf8;hpb=2f0dfdda8bc499fdb161c6a5850ec176e75bd4fa;p=collectd.git

diff --git a/src/apple_sensors.c b/src/apple_sensors.c
index 6b3cfc5e..ee0bf8c0 100644
--- a/src/apple_sensors.c
+++ b/src/apple_sensors.c
@@ -49,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;
@@ -120,9 +91,10 @@ static void as_submit (const char *type, const char *type_instance,
 	strcpy (vl.host, hostname_g);
 	strcpy (vl.plugin, "apple_sensors");
 	strcpy (vl.plugin_instance, "");
-	strcpy (vl.type_instance, type_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)
@@ -175,10 +147,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;
@@ -189,10 +161,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')
@@ -260,21 +232,9 @@ static int as_read (void)
 
 	return (0);
 } /* int as_read */
-#endif /* IOKIT_HAVE_READ */
 
-void module_register (modreg_e load)
+void module_register (void)
 {
-	if (load & MR_DATASETS)
-	{
-		plugin_register_data_set (&fanspeed_ds);
-		plugin_register_data_set (&temperature_ds);
-	}
-
-#if IOKIT_HAVE_READ
-	if (load & MR_READ)
-	{
-		plugin_register_init ("apple_sensors", as_init);
-		plugin_register_read ("apple_sensors", as_read);
-	}
-#endif /* IOKIT_HAVE_READ */
+	plugin_register_init ("apple_sensors", as_init);
+	plugin_register_read ("apple_sensors", as_read);
 } /* void module_register */