From: Francis Deslauriers <francis.deslauriers@efficios.com>
Date: Fri, 8 Nov 2019 21:01:03 +0000 (-0500)
Subject: src.ctf.lttng-live: replace usage of `calloc()` by `g_new0()`
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=b73700301e831acfc3d2828d22da60c3f62c497e

src.ctf.lttng-live: replace usage of `calloc()` by `g_new0()`

Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: I5c5ee34632488ff875b33b58fea67c16eb05f345
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2362
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
---

diff --git a/src/plugins/ctf/lttng-live/viewer-connection.c b/src/plugins/ctf/lttng-live/viewer-connection.c
index d6d2851a..0f1ddba9 100644
--- a/src/plugins/ctf/lttng-live/viewer-connection.c
+++ b/src/plugins/ctf/lttng-live/viewer-connection.c
@@ -1247,7 +1247,7 @@ enum lttng_live_get_one_metadata_status lttng_live_get_one_metadata_packet(
 	struct lttng_viewer_cmd cmd;
 	struct lttng_viewer_get_metadata rq;
 	struct lttng_viewer_metadata_packet rp;
-	char *data = NULL;
+	gchar *data = NULL;
 	ssize_t writelen;
 	struct lttng_live_session *session = trace->session;
 	struct lttng_live_msg_iter *lttng_live_msg_iter =
@@ -1312,7 +1312,7 @@ enum lttng_live_get_one_metadata_status lttng_live_get_one_metadata_packet(
 			BT_COMP_LOGE_APPEND_CAUSE(self_comp,
 				"Received get_metadata response: unknown");
 			status = LTTNG_LIVE_GET_ONE_METADATA_STATUS_ERROR;
-			goto error;
+			goto end;
 	}
 
 	len = be64toh(rp.len);
@@ -1321,15 +1321,15 @@ enum lttng_live_get_one_metadata_status lttng_live_get_one_metadata_packet(
 		BT_COMP_LOGE_APPEND_CAUSE(self_comp,
 			"Erroneous response length");
 		status = LTTNG_LIVE_GET_ONE_METADATA_STATUS_ERROR;
-		goto error;
+		goto end;
 	}
 
-	data = calloc(1, len);
+	data = g_new0(gchar, len);
 	if (!data) {
 		BT_COMP_LOGE_APPEND_CAUSE_ERRNO(self_comp,
 			"Failed to allocate data buffer", ".");
 		status = LTTNG_LIVE_GET_ONE_METADATA_STATUS_ERROR;
-		goto error;
+		goto end;
 	}
 
 	viewer_status = lttng_live_recv(viewer_connection, data, len);
@@ -1337,7 +1337,7 @@ enum lttng_live_get_one_metadata_status lttng_live_get_one_metadata_packet(
 		viewer_handle_recv_status(self_comp, NULL,
 			viewer_status, "get metadata packet");
 		status = (enum lttng_live_get_one_metadata_status) viewer_status;
-		goto error;
+		goto end;
 	}
 
 	/*
@@ -1348,16 +1348,14 @@ enum lttng_live_get_one_metadata_status lttng_live_get_one_metadata_packet(
 		BT_COMP_LOGE_APPEND_CAUSE(self_comp,
 			"Writing in the metadata file stream");
 		status = LTTNG_LIVE_GET_ONE_METADATA_STATUS_ERROR;
-		goto error;
+		goto end;
 	}
 
 	*reply_len = len;
 	status = LTTNG_LIVE_GET_ONE_METADATA_STATUS_OK;
 
-error:
-	free(data);
-
 end:
+	g_free(data);
 	return status;
 }