projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
7383e7c
)
match plugins: malloc + memset -> calloc
author
Ruben Kerkhof
<ruben@rubenkerkhof.com>
Fri, 1 Apr 2016 15:09:12 +0000
(17:09 +0200)
committer
Ruben Kerkhof
<ruben@rubenkerkhof.com>
Fri, 1 Apr 2016 15:09:12 +0000
(17:09 +0200)
src/match_empty_counter.c
patch
|
blob
|
history
src/match_hashed.c
patch
|
blob
|
history
src/match_regex.c
patch
|
blob
|
history
src/match_timediff.c
patch
|
blob
|
history
src/match_value.c
patch
|
blob
|
history
diff --git
a/src/match_empty_counter.c
b/src/match_empty_counter.c
index
4a5dc8c
..
8f99a6d
100644
(file)
--- a/
src/match_empty_counter.c
+++ b/
src/match_empty_counter.c
@@
-46,13
+46,12
@@
static int mec_create (const oconfig_item_t *ci, void **user_data) /* {{{ */
{
mec_match_t *m;
{
mec_match_t *m;
- m =
malloc (
sizeof (*m));
+ m =
calloc (1,
sizeof (*m));
if (m == NULL)
{
if (m == NULL)
{
- ERROR ("mec_create:
m
alloc failed.");
+ ERROR ("mec_create:
c
alloc failed.");
return (-ENOMEM);
}
return (-ENOMEM);
}
- memset (m, 0, sizeof (*m));
if (ci->children_num != 0)
{
if (ci->children_num != 0)
{
diff --git
a/src/match_hashed.c
b/src/match_hashed.c
index
049dd28
..
4178d75
100644
(file)
--- a/
src/match_hashed.c
+++ b/
src/match_hashed.c
@@
-101,13
+101,12
@@
static int mh_create (const oconfig_item_t *ci, void **user_data) /* {{{ */
mh_match_t *m;
int i;
mh_match_t *m;
int i;
- m =
malloc (
sizeof (*m));
+ m =
calloc (1,
sizeof (*m));
if (m == NULL)
{
if (m == NULL)
{
- ERROR ("mh_create:
m
alloc failed.");
+ ERROR ("mh_create:
c
alloc failed.");
return (-ENOMEM);
}
return (-ENOMEM);
}
- memset (m, 0, sizeof (*m));
for (i = 0; i < ci->children_num; i++)
{
for (i = 0; i < ci->children_num; i++)
{
diff --git
a/src/match_regex.c
b/src/match_regex.c
index
7429ffa
..
6e6bda2
100644
(file)
--- a/
src/match_regex.c
+++ b/
src/match_regex.c
@@
-140,13
+140,12
@@
static int mr_config_add_regex (mr_regex_t **re_head, /* {{{ */
return (-1);
}
return (-1);
}
- re =
malloc (
sizeof (*re));
+ re =
calloc (1,
sizeof (*re));
if (re == NULL)
{
if (re == NULL)
{
- log_err ("mr_config_add_regex:
m
alloc failed.");
+ log_err ("mr_config_add_regex:
c
alloc failed.");
return (-1);
}
return (-1);
}
- memset (re, 0, sizeof (*re));
re->next = NULL;
re->re_str = strdup (ci->values[0].value.string);
re->next = NULL;
re->re_str = strdup (ci->values[0].value.string);
@@
-194,14
+193,13
@@
static int mr_create (const oconfig_item_t *ci, void **user_data) /* {{{ */
int status;
int i;
int status;
int i;
- m =
malloc (
sizeof (*m));
+ m =
calloc (1,
sizeof (*m));
if (m == NULL)
{
if (m == NULL)
{
- log_err ("mr_create:
m
alloc failed.");
+ log_err ("mr_create:
c
alloc failed.");
return (-ENOMEM);
}
return (-ENOMEM);
}
- memset (m, 0, sizeof (*m));
-
+
m->invert = 0;
status = 0;
m->invert = 0;
status = 0;
diff --git
a/src/match_timediff.c
b/src/match_timediff.c
index
2b5f530
..
77c8f51
100644
(file)
--- a/
src/match_timediff.c
+++ b/
src/match_timediff.c
@@
-52,13
+52,12
@@
static int mt_create (const oconfig_item_t *ci, void **user_data) /* {{{ */
int status;
int i;
int status;
int i;
- m =
malloc (
sizeof (*m));
+ m =
calloc (1,
sizeof (*m));
if (m == NULL)
{
if (m == NULL)
{
- ERROR ("mt_create:
m
alloc failed.");
+ ERROR ("mt_create:
c
alloc failed.");
return (-ENOMEM);
}
return (-ENOMEM);
}
- memset (m, 0, sizeof (*m));
m->future = 0;
m->past = 0;
m->future = 0;
m->past = 0;
diff --git
a/src/match_value.c
b/src/match_value.c
index
9b13aa8
..
8c6fd36
100644
(file)
--- a/
src/match_value.c
+++ b/
src/match_value.c
@@
-200,13
+200,12
@@
static int mv_create (const oconfig_item_t *ci, void **user_data) /* {{{ */
int status;
int i;
int status;
int i;
- m =
malloc (
sizeof (*m));
+ m =
calloc (1,
sizeof (*m));
if (m == NULL)
{
if (m == NULL)
{
- ERROR ("mv_create:
m
alloc failed.");
+ ERROR ("mv_create:
c
alloc failed.");
return (-ENOMEM);
}
return (-ENOMEM);
}
- memset (m, 0, sizeof (*m));
m->min = NAN;
m->max = NAN;
m->min = NAN;
m->max = NAN;