X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmatch_regex.c;h=2dee9a8fc39b4afa59c7a5dfadaed0c7ecf36632;hb=71bbf854d3e6f8c6d6c3582527263bb01a3a7e04;hp=4fa6ce78d5d0c0007629a98e43fe4c5b3fbc2973;hpb=6d13532642c934667697842e4ff021e070ddf34d;p=collectd.git

diff --git a/src/match_regex.c b/src/match_regex.c
index 4fa6ce78..2dee9a8f 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 = (mr_regex_t *) 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);
@@ -163,7 +162,7 @@ static int mr_config_add_regex (mr_regex_t **re_head, /* {{{ */
 		char errmsg[1024];
 		regerror (status, &re->re, errmsg, sizeof (errmsg));
 		errmsg[sizeof (errmsg) - 1] = 0;
-		log_err ("Compiling regex `%s' for `%s' failed: %s.", 
+		log_err ("Compiling regex `%s' for `%s' failed: %s.",
 				re->re_str, ci->key, errmsg);
 		free (re->re_str);
 		free (re);
@@ -194,14 +193,13 @@ static int mr_create (const oconfig_item_t *ci, void **user_data) /* {{{ */
 	int status;
 	int i;
 
-	m = (mr_match_t *) 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;
@@ -305,9 +303,8 @@ static int mr_match (const data_set_t __attribute__((unused)) *ds, /* {{{ */
 
 void module_register (void)
 {
-	match_proc_t mproc;
+	match_proc_t mproc = { 0 };
 
-	memset (&mproc, 0, sizeof (mproc));
 	mproc.create  = mr_create;
 	mproc.destroy = mr_destroy;
 	mproc.match   = mr_match;