Merge remote-tracking branch 'github/pr/387'

[collectd.git] / src / apple_sensors.c

diff --git a/src/apple_sensors.c b/src/apple_sensors.c
index 2726ad2efdb6fc550e05163814e4c2f9c2d49557..bdba0ff85287745c960c1e5399d813aad2c116e2 100644 (file)
--- a/src/apple_sensors.c
+++ b/src/apple_sensors.c
@@ -87,13 +87,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)
@@ -146,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;
@@ -160,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')
@@ -192,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)
                {
@@ -212,7 +212,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
                {