projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unified string handling.
[collectd.git]
/
src
/
apple_sensors.c
diff --git
a/src/apple_sensors.c
b/src/apple_sensors.c
index
5db6e9c
..
ee0bf8c
100644
(file)
--- a/
src/apple_sensors.c
+++ b/
src/apple_sensors.c
@@
-91,8
+91,8
@@
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.host, hostname_g);
strcpy (vl.plugin, "apple_sensors");
strcpy (vl.plugin_instance, "");
- strncpy (vl.type, type, sizeof (vl.type))
- strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
+ s
s
trncpy (vl.type, type, sizeof (vl.type))
+ s
s
trncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
plugin_dispatch_values (&vl);
}
plugin_dispatch_values (&vl);
}
@@
-147,10
+147,10
@@
static int as_read (void)
if (CFGetTypeID (property) != CFStringGetTypeID ())
continue;
if (!CFStringGetCString (property,
if (CFGetTypeID (property) != CFStringGetTypeID ())
continue;
if (!CFStringGetCString (property,
- type,
128
,
+ type,
sizeof (type)
,
kCFStringEncodingASCII))
continue;
kCFStringEncodingASCII))
continue;
- type[
127
] = '\0';
+ type[
sizeof (type) - 1
] = '\0';
/* Copy the sensor location. This will be used as `instance'. */
property = NULL;
/* Copy the sensor location. This will be used as `instance'. */
property = NULL;
@@
-161,10
+161,10
@@
static int as_read (void)
if (CFGetTypeID (property) != CFStringGetTypeID ())
continue;
if (!CFStringGetCString (property,
if (CFGetTypeID (property) != CFStringGetTypeID ())
continue;
if (!CFStringGetCString (property,
- inst,
128
,
+ inst,
sizeof (inst)
,
kCFStringEncodingASCII))
continue;
kCFStringEncodingASCII))
continue;
- inst[
127
] = '\0';
+ inst[
sizeof (inst) - 1
] = '\0';
for (i = 0; i < 128; i++)
{
if (inst[i] == '\0')
for (i = 0; i < 128; i++)
{
if (inst[i] == '\0')