projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Treewide: cleanup whitespace
[collectd.git]
/
src
/
curl.c
diff --git
a/src/curl.c
b/src/curl.c
index
ac4cc51
..
5f78207
100644
(file)
--- a/
src/curl.c
+++ b/
src/curl.c
@@
-270,13
+270,12
@@
static int cc_config_add_match (web_page_t *page, /* {{{ */
WARNING ("curl plugin: Ignoring arguments for the `Match' block.");
}
WARNING ("curl plugin: Ignoring arguments for the `Match' block.");
}
- match =
(web_match_t *) malloc (
sizeof (*match));
+ match =
calloc (1,
sizeof (*match));
if (match == NULL)
{
if (match == NULL)
{
- ERROR ("curl plugin:
m
alloc failed.");
+ ERROR ("curl plugin:
c
alloc failed.");
return (-1);
}
return (-1);
}
- memset (match, 0, sizeof (*match));
status = 0;
for (i = 0; i < ci->children_num; i++)
status = 0;
for (i = 0; i < ci->children_num; i++)
@@
-388,7
+387,7
@@
static int cc_page_init_curl (web_page_t *wp) /* {{{ */
if (wp->pass != NULL)
credentials_size += strlen (wp->pass);
if (wp->pass != NULL)
credentials_size += strlen (wp->pass);
- wp->credentials =
(char *)
malloc (credentials_size);
+ wp->credentials = malloc (credentials_size);
if (wp->credentials == NULL)
{
ERROR ("curl plugin: malloc failed.");
if (wp->credentials == NULL)
{
ERROR ("curl plugin: malloc failed.");
@@
-418,8
+417,7
@@
static int cc_page_init_curl (web_page_t *wp) /* {{{ */
if (wp->timeout >= 0)
curl_easy_setopt (wp->curl, CURLOPT_TIMEOUT_MS, (long) wp->timeout);
else
if (wp->timeout >= 0)
curl_easy_setopt (wp->curl, CURLOPT_TIMEOUT_MS, (long) wp->timeout);
else
- curl_easy_setopt (wp->curl, CURLOPT_TIMEOUT_MS,
- CDTIME_T_TO_MS(plugin_get_interval()));
+ curl_easy_setopt (wp->curl, CURLOPT_TIMEOUT_MS, (long) CDTIME_T_TO_MS(plugin_get_interval()));
#endif
return (0);
#endif
return (0);
@@
-437,13
+435,12
@@
static int cc_config_add_page (oconfig_item_t *ci) /* {{{ */
return (-1);
}
return (-1);
}
- page =
(web_page_t *) malloc (
sizeof (*page));
+ page =
calloc (1,
sizeof (*page));
if (page == NULL)
{
if (page == NULL)
{
- ERROR ("curl plugin:
m
alloc failed.");
+ ERROR ("curl plugin:
c
alloc failed.");
return (-1);
}
return (-1);
}
- memset (page, 0, sizeof (*page));
page->url = NULL;
page->user = NULL;
page->pass = NULL;
page->url = NULL;
page->user = NULL;
page->pass = NULL;