X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fapple_sensors.c;h=629633589bc0b086b3918d167090512b2bba33d2;hb=92445ff3363441d0f515de4a3ab92a504cfc0366;hp=f994b3194f373346baa2e1af6cff798d764ccd41;hpb=838af4cdc6c8674ed3e14a95fea172118c707a85;p=collectd.git

diff --git a/src/apple_sensors.c b/src/apple_sensors.c
index f994b319..62963358 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;
@@ -117,12 +88,13 @@ static void as_submit (const char *type, const char *type_instance,
 	vl.values = values;
 	vl.values_len = 1;
 	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	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)
@@ -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')
@@ -221,17 +193,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)
 		{
@@ -241,7 +213,7 @@ 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
 		{
@@ -260,15 +232,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 */