X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fwrite_riemann.c;h=8191ae256d61caec939dacd322c82fab8ca49fba;hb=895a5234dc9a798241747f703b05e5b51e3f5a33;hp=6a47ba3224cd52d6bbf5d75ca24cf73af6d55f41;hpb=eb2f3a4bdc78e1e2c4191b4e08d75d5eeea8be0e;p=collectd.git

diff --git a/src/write_riemann.c b/src/write_riemann.c
index 6a47ba32..8191ae25 100644
--- a/src/write_riemann.c
+++ b/src/write_riemann.c
@@ -205,12 +205,11 @@ static int riemann_send_msg (struct riemann_host *host, const Msg *msg) /* {{{ *
 	if (host->use_tcp)
 		buffer_len += 4;
 
-	buffer = malloc (buffer_len);
+	buffer = calloc (1, buffer_len);
 	if (buffer == NULL) {
-		ERROR ("write_riemann plugin: malloc failed.");
+		ERROR ("write_riemann plugin: calloc failed.");
 		return ENOMEM;
 	}
-	memset (buffer, 0, buffer_len);
 
 	if (host->use_tcp)
 	{
@@ -365,13 +364,12 @@ static Msg *riemann_notification_to_protobuf(struct riemann_host *host, /* {{{ *
 	notification_meta_t *meta;
 	size_t i;
 
-	msg = malloc (sizeof (*msg));
+	msg = calloc (1, sizeof (*msg));
 	if (msg == NULL)
 	{
-		ERROR ("write_riemann plugin: malloc failed.");
+		ERROR ("write_riemann plugin: calloc failed.");
 		return (NULL);
 	}
-	memset (msg, 0, sizeof (*msg));
 	msg__init (msg);
 
 	msg->events = malloc (sizeof (*msg->events));
@@ -382,15 +380,14 @@ static Msg *riemann_notification_to_protobuf(struct riemann_host *host, /* {{{ *
 		return (NULL);
 	}
 
-	event = malloc (sizeof (*event));
+	event = calloc (1, sizeof (*event));
 	if (event == NULL)
 	{
-		ERROR ("write_riemann plugin: malloc failed.");
+		ERROR ("write_riemann plugin: calloc failed.");
 		sfree (msg->events);
 		sfree (msg);
 		return (NULL);
 	}
-	memset (event, 0, sizeof (*event));
 	event__init (event);
 
 	msg->events[0] = event;
@@ -474,13 +471,12 @@ static Event *riemann_value_to_protobuf(struct riemann_host const *host, /* {{{
 	double ttl;
 	size_t i;
 
-	event = malloc (sizeof (*event));
+	event = calloc (1, sizeof (*event));
 	if (event == NULL)
 	{
-		ERROR ("write_riemann plugin: malloc failed.");
+		ERROR ("write_riemann plugin: calloc failed.");
 		return (NULL);
 	}
-	memset (event, 0, sizeof (*event));
 	event__init (event);
 
 	event->host = strdup (vl->host);
@@ -607,13 +603,12 @@ static Msg *riemann_value_list_to_protobuf (struct riemann_host const *host, /*
 	gauge_t *rates = NULL;
 
 	/* Initialize the Msg structure. */
-	msg = malloc (sizeof (*msg));
+	msg = calloc (1, sizeof (*msg));
 	if (msg == NULL)
 	{
-		ERROR ("write_riemann plugin: malloc failed.");
+		ERROR ("write_riemann plugin: calloc failed.");
 		return (NULL);
 	}
-	memset (msg, 0, sizeof (*msg));
 	msg__init (msg);
 
 	/* Set up events. First, the list of pointers. */