X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fmatch_regex.c;h=6e6bda2a41792cfa532561ad15ff858d86a37112;hb=129fdc526ba4ad6b5bd1f7db296eb11c1a9c75bd;hp=7429ffaf719d063e87367aaf2be42afafaf13d24;hpb=7383e7cf33edb331e0ec64ba2c1f67b297856dc8;p=collectd.git diff --git a/src/match_regex.c b/src/match_regex.c index 7429ffaf..6e6bda2a 100644 --- 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); } - re = malloc (sizeof (*re)); + re = calloc (1, sizeof (*re)); if (re == NULL) { - log_err ("mr_config_add_regex: malloc failed."); + log_err ("mr_config_add_regex: calloc failed."); return (-1); } - memset (re, 0, sizeof (*re)); 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; - m = malloc (sizeof (*m)); + m = calloc (1, sizeof (*m)); if (m == NULL) { - log_err ("mr_create: malloc failed."); + log_err ("mr_create: calloc failed."); return (-ENOMEM); } - memset (m, 0, sizeof (*m)); - + m->invert = 0; status = 0;