From 6a00837f8cb0431a2ad90974d67fae138ea97dd5 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Sun, 21 Jul 2013 19:08:06 -0400 Subject: [PATCH] Fix: format string type mismatch Signed-off-by: Mathieu Desnoyers --- src/bin/lttng-sessiond/ust-app.c | 2 +- src/common/consumer.c | 4 ++-- src/common/kernel-consumer/kernel-consumer.c | 6 +++--- src/common/ust-consumer/ust-consumer.c | 7 ++++--- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c index 7e263a763..9fe54835b 100644 --- a/src/bin/lttng-sessiond/ust-app.c +++ b/src/bin/lttng-sessiond/ust-app.c @@ -4940,7 +4940,7 @@ int ust_app_snapshot_record(struct ltt_ust_session *usess, reg_chan->subbuf_size > max_stream_size) { ret = -EINVAL; DBG3("UST app snapshot record maximum stream size %" PRIu64 - " is smaller than subbuffer size of %" PRIu64, + " is smaller than subbuffer size of %zu", max_stream_size, reg_chan->subbuf_size); goto error; } diff --git a/src/common/consumer.c b/src/common/consumer.c index f5bc5c58a..4b657f332 100644 --- a/src/common/consumer.c +++ b/src/common/consumer.c @@ -2207,7 +2207,7 @@ restart: pipe_len = lttng_pipe_read(ctx->consumer_metadata_pipe, &stream, sizeof(stream)); if (pipe_len < 0) { - ERR("read metadata stream, ret: %ld", pipe_len); + ERR("read metadata stream, ret: %zd", pipe_len); /* * Continue here to handle the rest of the streams. */ @@ -2422,7 +2422,7 @@ void *consumer_thread_data_poll(void *data) pipe_readlen = lttng_pipe_read(ctx->consumer_data_pipe, &new_stream, sizeof(new_stream)); if (pipe_readlen < 0) { - ERR("Consumer data pipe ret %ld", pipe_readlen); + ERR("Consumer data pipe ret %zd", pipe_readlen); /* Continue so we can at least handle the current stream(s). */ continue; } diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c index a94749635..8416bc5a3 100644 --- a/src/common/kernel-consumer/kernel-consumer.c +++ b/src/common/kernel-consumer/kernel-consumer.c @@ -118,13 +118,13 @@ int lttng_kconsumer_snapshot_channel(uint64_t key, char *path, struct lttng_consumer_channel *channel; struct lttng_consumer_stream *stream; - DBG("Kernel consumer snapshot channel %lu", key); + DBG("Kernel consumer snapshot channel %" PRIu64, key); rcu_read_lock(); channel = consumer_find_channel(key); if (!channel) { - ERR("No channel found for key %lu", key); + ERR("No channel found for key %" PRIu64, key); ret = -1; goto end; } @@ -356,7 +356,7 @@ int lttng_kconsumer_snapshot_metadata(uint64_t key, char *path, ret_read = lttng_kconsumer_read_subbuffer(metadata_stream, ctx); if (ret_read < 0) { if (ret_read != -EPERM) { - ERR("Kernel snapshot reading metadata subbuffer (ret: %ld)", + ERR("Kernel snapshot reading metadata subbuffer (ret: %zd)", ret_read); goto error; } diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c index 336466a47..676aa0d9e 100644 --- a/src/common/ust-consumer/ust-consumer.c +++ b/src/common/ust-consumer/ust-consumer.c @@ -767,7 +767,8 @@ static int snapshot_metadata(uint64_t key, char *path, uint64_t relayd_id, metadata_channel = consumer_find_channel(key); if (!metadata_channel) { - ERR("UST snapshot metadata channel not found for key %lu", key); + ERR("UST snapshot metadata channel not found for key %" PRIu64, + key); ret = -1; goto error; } @@ -863,12 +864,12 @@ static int snapshot_channel(uint64_t key, char *path, uint64_t relayd_id, channel = consumer_find_channel(key); if (!channel) { - ERR("UST snapshot channel not found for key %lu", key); + ERR("UST snapshot channel not found for key %" PRIu64, key); ret = -1; goto error; } assert(!channel->monitor); - DBG("UST consumer snapshot channel %lu", key); + DBG("UST consumer snapshot channel %" PRIu64, key); cds_list_for_each_entry(stream, &channel->streams.head, send_node) { /* Lock stream because we are about to change its state. */ -- 2.34.1