projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b59a0c0
)
curl_xml: malloc + memset -> calloc
author
Ruben Kerkhof
<ruben@rubenkerkhof.com>
Mon, 28 Mar 2016 17:50:51 +0000
(19:50 +0200)
committer
Ruben Kerkhof
<ruben@rubenkerkhof.com>
Mon, 28 Mar 2016 17:50:51 +0000
(19:50 +0200)
src/curl_xml.c
patch
|
blob
|
history
diff --git
a/src/curl_xml.c
b/src/curl_xml.c
index
ab18b78
..
b9f0c24
100644
(file)
--- a/
src/curl_xml.c
+++ b/
src/curl_xml.c
@@
-709,13
+709,12
@@
static int cx_config_add_xpath (cx_t *db, oconfig_item_t *ci) /* {{{ */
int status;
int i;
int status;
int i;
- xpath =
malloc (
sizeof (*xpath));
+ xpath =
calloc (1,
sizeof (*xpath));
if (xpath == NULL)
{
if (xpath == NULL)
{
- ERROR ("curl_xml plugin:
m
alloc failed.");
+ ERROR ("curl_xml plugin:
c
alloc failed.");
return (-1);
}
return (-1);
}
- memset (xpath, 0, sizeof (*xpath));
status = cf_util_get_string (ci, &xpath->path);
if (status != 0)
status = cf_util_get_string (ci, &xpath->path);
if (status != 0)
@@
-923,13
+922,12
@@
static int cx_config_add_url (oconfig_item_t *ci) /* {{{ */
return (-1);
}
return (-1);
}
- db =
malloc (
sizeof (*db));
+ db =
calloc (1,
sizeof (*db));
if (db == NULL)
{
if (db == NULL)
{
- ERROR ("curl_xml plugin:
m
alloc failed.");
+ ERROR ("curl_xml plugin:
c
alloc failed.");
return (-1);
}
return (-1);
}
- memset (db, 0, sizeof (*db));
db->timeout = -1;
db->timeout = -1;