Fix: relayd: wrong stream type used in DBG statement

[lttng-tools.git] / src / bin / lttng-relayd / live.c

diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c
index 37c5464520f1bf08546ac051d8e1bf38046c9d65..d5f04582419dffec1466c60c4de449cf34948a03 100644 (file)
--- a/src/bin/lttng-relayd/live.c
+++ b/src/bin/lttng-relayd/live.c
@@ -192,7 +192,6 @@ ssize_t send_viewer_streams(struct lttcomm_sock *sock,
                uint64_t session_id, unsigned int ignore_sent_flag)
 {
        ssize_t ret;
-       struct lttng_viewer_stream send_stream;
        struct lttng_ht_iter iter;
        struct relay_viewer_stream *vstream;
 
@@ -201,6 +200,7 @@ ssize_t send_viewer_streams(struct lttcomm_sock *sock,
        cds_lfht_for_each_entry(viewer_streams_ht->ht, &iter.iter, vstream,
                        stream_n.node) {
                struct ctf_trace *ctf_trace;
+               struct lttng_viewer_stream send_stream = {};
 
                health_code_update();
 
@@ -1545,7 +1545,7 @@ int viewer_get_next_index(struct relay_connection *conn)
        if (rstream->trace_chunk && !lttng_trace_chunk_ids_equal(
                        conn->viewer_session->current_trace_chunk,
                        rstream->trace_chunk)) {
-               DBG("Metadata relay stream and viewer chunk ids differ");
+               DBG("Relay stream and viewer chunk ids differ");
 
                ret = viewer_session_set_trace_chunk_copy(
                                conn->viewer_session,
@@ -2048,7 +2048,7 @@ int viewer_get_metadata(struct relay_connection *conn)
                                        vstream->stream_file.handle, -read_len,
                                        SEEK_CUR);
 
-                       DBG("Failed to read metadata: requested = %zd, got = %zd",
+                       DBG("Failed to read metadata: requested = %" PRIu64 ", got = %zd",
                                        len, read_len);
                        read_len = 0;
                        len = 0;