From eaeb64a96cf1ecf2a1b6e654a74bb38892bbfd9e Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Tue, 10 Sep 2019 20:08:30 -0400 Subject: [PATCH] Fix: communication error unreported in relay_rotate_session_streams MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 'ret' is set to 0 even if the communication with the relay daemon fails in relay_rotate_session_streams(). This also fixes a dead-assignment warning. Signed-off-by: Jérémie Galarneau --- src/bin/lttng-relayd/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c index 62a5bd7ce..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; -- 2.34.1