Fix: handle 64-bit trace IDs on 32-bit systems

[babeltrace.git] / formats / lttng-live / lttng-live-comm.c

diff --git a/formats/lttng-live/lttng-live-comm.c b/formats/lttng-live/lttng-live-comm.c
index b9bbbb6725da0aa2bcb7076a0e624b848db44206..a44516de6fc05306b2461710483e971fd6ccf19d 100644 (file)
--- a/formats/lttng-live/lttng-live-comm.c
+++ b/formats/lttng-live/lttng-live-comm.c
@@ -381,13 +381,13 @@ int lttng_live_ctf_trace_assign(struct lttng_live_viewer_stream *stream,
        int ret = 0;
 
        trace = g_hash_table_lookup(stream->session->ctf_traces,
-                       (gpointer) ctf_trace_id);
+                       &ctf_trace_id);
        if (!trace) {
                trace = g_new0(struct lttng_live_ctf_trace, 1);
                trace->ctf_trace_id = ctf_trace_id;
                trace->streams = g_ptr_array_new();
                g_hash_table_insert(stream->session->ctf_traces,
-                               (gpointer) ctf_trace_id,
+                               &trace->ctf_trace_id,
                                trace);
        }
        if (stream->metadata_flag)
@@ -680,8 +680,8 @@ retry:
                goto error;
        }
        if (ret_len != sizeof(rp)) {
-               fprintf(stderr, "[error] get_data_packet: expected %" PRId64
-                               ", received %" PRId64 "\n", sizeof(rp),
+               fprintf(stderr, "[error] get_data_packet: expected %zu"
+                               ", received %zd\n", sizeof(rp),
                                ret_len);
                goto error;
        }
@@ -1655,7 +1655,7 @@ int lttng_live_read(struct lttng_live_ctx *ctx)
 
        for (i = 0; i < ctx->session_ids->len; i++) {
                id = g_array_index(ctx->session_ids, uint64_t, i);
-               printf_verbose("Attaching to session %lu\n", id);
+               printf_verbose("Attaching to session %" PRIu64 "\n", id);
                ret = lttng_live_attach_session(ctx, id);
                printf_verbose("Attaching session returns %d\n", ret);
                if (ret < 0) {