X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fapple_sensors.c;fp=src%2Fapple_sensors.c;h=629633589bc0b086b3918d167090512b2bba33d2;hb=10075e6fe3c384b73c2dd398a1435f8d10e56654;hp=5e957b6f88a9e9b302634b6aa0f053118c6db020;hpb=9bbf7d748e3fc79ac66b496cfda50706228e7c2b;p=collectd.git diff --git a/src/apple_sensors.c b/src/apple_sensors.c index 5e957b6f..62963358 100644 --- a/src/apple_sensors.c +++ b/src/apple_sensors.c @@ -91,9 +91,10 @@ static void as_submit (const char *type, const char *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 +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; @@ -160,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')