processes plugin: Use STATIC_ARRAY_SIZE instead of numeric value.

[collectd.git] / src / apple_sensors.c

diff --git a/src/apple_sensors.c b/src/apple_sensors.c
index 848c212..ee0bf8c 100644 (file)
--- a/src/apple_sensors.c
+++ b/src/apple_sensors.c
@@ -49,17 +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
 
-#if IOKIT_HAVE_READ
 static int as_init (void)
 {
        kern_return_t status;
@@ -100,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)
@@ -155,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;
@@ -169,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')
@@ -240,15 +232,9 @@ static int as_read (void)
 
        return (0);
 } /* int as_read */
-#endif /* IOKIT_HAVE_READ */
 
 void module_register (void)
 {
-#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 */