Fix: communication error unreported in relay_rotate_session_streams

'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 <jeremie.galarneau@efficios.com>

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 62a5bd7cefc16026ff05f3e3741e4b4258837fd1..0cd163fe85eae4028ce025c0cd1a5d35b5361132 100644 (file)
--- 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;
        }
 
        reply_code = LTTNG_OK;

+       ret = 0;

 end:
        if (stream) {
                stream_put(stream);
 end:
        if (stream) {
                stream_put(stream);


@@ -2295,8 +2296,6 @@ end:
                                send_ret);
                ret = -1;
        }
                                send_ret);
                ret = -1;
        }

-
-       ret = 0;

 end_no_reply:
        lttng_trace_chunk_put(next_trace_chunk);
        return ret;
 end_no_reply:
        lttng_trace_chunk_put(next_trace_chunk);
        return ret;