X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=0cd163fe85eae4028ce025c0cd1a5d35b5361132;hb=eaeb64a96cf1ecf2a1b6e654a74bb38892bbfd9e;hp=2ffa75078779b7d0b9986696f5643267ca5ea7aa;hpb=8d382dd4d4e95ea6ff88d6bd9f8a8fc85970ee3b;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 2ffa75078..0cd163fe8 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -2282,6 +2282,7 @@ static int relay_rotate_session_streams(
 	}
 
 	reply_code = LTTNG_OK;
+	ret = 0;
 end:
 	if (stream) {
 		stream_put(stream);
@@ -2295,8 +2296,6 @@ end:
 				send_ret);
 		ret = -1;
 	}
-
-	ret = 0;
 end_no_reply:
 	lttng_trace_chunk_put(next_trace_chunk);
 	return ret;
@@ -2469,7 +2468,7 @@ static int relay_close_trace_chunk(const struct lttcomm_relayd_hdr *recv_hdr,
 		struct relay_connection *conn,
 		const struct lttng_buffer_view *payload)
 {
-	int ret = 0;
+	int ret = 0, buf_ret;
 	ssize_t send_ret;
 	struct relay_session *session = conn->session;
 	struct lttcomm_relayd_close_trace_chunk *msg;
@@ -2630,17 +2629,17 @@ end_unlock_session:
 end:
 	reply.generic.ret_code = htobe32((uint32_t) reply_code);
 	reply.path_length = htobe32((uint32_t) path_length);
-	ret = lttng_dynamic_buffer_append(
+	buf_ret = lttng_dynamic_buffer_append(
 			&reply_payload, &reply, sizeof(reply));
-	if (ret) {
+	if (buf_ret) {
 		ERR("Failed to append \"close trace chunk\" command reply header to payload buffer");
 		goto end_no_reply;
 	}
 
 	if (reply_code == LTTNG_OK) {
-		ret = lttng_dynamic_buffer_append(&reply_payload,
+		buf_ret = lttng_dynamic_buffer_append(&reply_payload,
 				closed_trace_chunk_path, path_length);
-		if (ret) {
+		if (buf_ret) {
 			ERR("Failed to append \"close trace chunk\" command reply path to payload buffer");
 			goto end_no_reply;
 		}