projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1646 from rubenk/cleanup-malloc-calls
[collectd.git]
/
src
/
sensors.c
diff --git
a/src/sensors.c
b/src/sensors.c
index
dc6a210
..
6125d0b
100644
(file)
--- a/
src/sensors.c
+++ b/
src/sensors.c
@@
-176,7
+176,7
@@
static char *conffile = NULL;
"as bug."
#endif
"as bug."
#endif
-featurelist_t *first_feature = NULL;
+
static
featurelist_t *first_feature = NULL;
static ignorelist_t *sensor_list;
#if SENSORS_API_VERSION < 0x400
static ignorelist_t *sensor_list;
#if SENSORS_API_VERSION < 0x400
@@
-378,13
+378,12
@@
static int sensors_load_conf (void)
continue;
}
continue;
}
- fl =
(featurelist_t *) malloc (sizeof (featurelist_t
));
+ fl =
calloc (1, sizeof (*fl
));
if (fl == NULL)
{
if (fl == NULL)
{
- ERROR ("sensors plugin:
m
alloc failed.");
+ ERROR ("sensors plugin:
c
alloc failed.");
continue;
}
continue;
}
- memset (fl, '\0', sizeof (featurelist_t));
fl->chip = chip;
fl->data = feature;
fl->chip = chip;
fl->data = feature;
@@
-435,13
+434,12
@@
static int sensors_load_conf (void)
&& (subfeature->type != SENSORS_SUBFEATURE_POWER_INPUT))
continue;
&& (subfeature->type != SENSORS_SUBFEATURE_POWER_INPUT))
continue;
- fl =
(featurelist_t *) malloc (sizeof (featurelist_t
));
+ fl =
calloc (1, sizeof (*fl
));
if (fl == NULL)
{
if (fl == NULL)
{
- ERROR ("sensors plugin:
m
alloc failed.");
+ ERROR ("sensors plugin:
c
alloc failed.");
continue;
}
continue;
}
- memset (fl, '\0', sizeof (featurelist_t));
fl->chip = chip;
fl->feature = feature;
fl->chip = chip;
fl->feature = feature;