From 8fd623e0d1c389a76e4dc3ee74a77490b678c5b8 Mon Sep 17 00:00:00 2001 From: David Goulet Date: Mon, 22 Apr 2013 13:32:47 -0400 Subject: [PATCH] Fix: multiple type mismatch in debug statement This removes all the type mismatch warnings for x86 architecture. Signed-off-by: David Goulet --- src/bin/lttng-relayd/cmd-generic.c | 2 +- src/bin/lttng-sessiond/consumer.c | 2 +- src/common/relayd/relayd.c | 6 +++--- src/common/ust-consumer/ust-consumer.c | 27 +++++++++++++------------- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/bin/lttng-relayd/cmd-generic.c b/src/bin/lttng-relayd/cmd-generic.c index 1122bfe20..9029dcd41 100644 --- a/src/bin/lttng-relayd/cmd-generic.c +++ b/src/bin/lttng-relayd/cmd-generic.c @@ -37,7 +37,7 @@ int cmd_recv(struct lttcomm_sock *sock, void *buf, size_t len) DBG("Socket %d did an orderly shutdown", sock->fd); } else { ERR("Relay didn't receive valid add_stream struct size. " - "Expected %lu, got %d", len, ret); + "Expected %zu, got %d", len, ret); } ret = -1; goto error; diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c index e3d1be0cc..7ad749e6d 100644 --- a/src/bin/lttng-sessiond/consumer.c +++ b/src/bin/lttng-sessiond/consumer.c @@ -1121,7 +1121,7 @@ int consumer_push_metadata(struct consumer_socket *socket, goto end; } - DBG3("Consumer pushing metadata on sock %d of len %lu", socket->fd, len); + DBG3("Consumer pushing metadata on sock %d of len %zu", socket->fd, len); ret = lttcomm_send_unix_sock(socket->fd, metadata_str, len); if (ret < 0) { diff --git a/src/common/relayd/relayd.c b/src/common/relayd/relayd.c index 82bcf5ff6..aa3f76853 100644 --- a/src/common/relayd/relayd.c +++ b/src/common/relayd/relayd.c @@ -87,7 +87,7 @@ static int recv_reply(struct lttcomm_relayd_sock *rsock, void *data, size_t size { int ret; - DBG3("Relayd waiting for reply of size %ld", size); + DBG3("Relayd waiting for reply of size %zu", size); ret = rsock->sock.ops->recvmsg(&rsock->sock, data, size, 0); if (ret <= 0 || ret != size) { @@ -95,7 +95,7 @@ static int recv_reply(struct lttcomm_relayd_sock *rsock, void *data, size_t size /* Orderly shutdown. */ DBG("Socket %d has performed an orderly shutdown", rsock->sock.fd); } else { - DBG("Receiving reply failed on sock %d for size %lu with ret %d", + DBG("Receiving reply failed on sock %d for size %zu with ret %d", rsock->sock.fd, size, ret); } /* Always return -1 here and the caller can use errno. */ @@ -396,7 +396,7 @@ int relayd_send_data_hdr(struct lttcomm_relayd_sock *rsock, assert(rsock); assert(hdr); - DBG3("Relayd sending data header of size %ld", size); + DBG3("Relayd sending data header of size %zu", size); /* Again, safety net */ if (size == 0) { diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c index 5581dce19..0edb513f8 100644 --- a/src/common/ust-consumer/ust-consumer.c +++ b/src/common/ust-consumer/ust-consumer.c @@ -556,7 +556,7 @@ int lttng_ustconsumer_push_metadata(struct lttng_consumer_channel *metadata, ret = ustctl_write_metadata_to_channel(metadata->uchan, metadata_str + target_offset, len); if (ret < 0) { - ERR("ustctl write metadata fail with ret %d, len %ld", ret, len); + ERR("ustctl write metadata fail with ret %d, len %" PRIu64, ret, len); goto error; } @@ -579,11 +579,11 @@ static int flush_channel(uint64_t chan_key) struct lttng_ht *ht; struct lttng_ht_iter iter; - DBG("UST consumer flush channel key %lu", chan_key); + DBG("UST consumer flush channel key %" PRIu64, chan_key); channel = consumer_find_channel(chan_key); if (!channel) { - ERR("UST consumer flush channel %lu not found", chan_key); + ERR("UST consumer flush channel %" PRIu64 " not found", chan_key); ret = LTTNG_ERR_UST_CHAN_NOT_FOUND; goto error; } @@ -613,11 +613,11 @@ static int close_metadata(uint64_t chan_key) int ret; struct lttng_consumer_channel *channel; - DBG("UST consumer close metadata key %lu", chan_key); + DBG("UST consumer close metadata key %" PRIu64, chan_key); channel = consumer_find_channel(chan_key); if (!channel) { - ERR("UST consumer close metadata %lu not found", chan_key); + ERR("UST consumer close metadata %" PRIu64 " not found", chan_key); ret = LTTNG_ERR_UST_CHAN_NOT_FOUND; goto error; } @@ -648,7 +648,7 @@ static int setup_metadata(struct lttng_consumer_local_data *ctx, uint64_t key) int ret; struct lttng_consumer_channel *metadata; - DBG("UST consumer setup metadata key %lu", key); + DBG("UST consumer setup metadata key %" PRIu64, key); metadata = consumer_find_channel(key); if (!metadata) { @@ -701,7 +701,7 @@ int lttng_ustconsumer_recv_metadata(int sock, uint64_t key, uint64_t offset, int ret, ret_code = LTTNG_OK; char *metadata_str; - DBG("UST consumer push metadata key %lu of len %lu", key, len); + DBG("UST consumer push metadata key %" PRIu64 " of len %" PRIu64, key, len); metadata_str = zmalloc(len * sizeof(char)); if (!metadata_str) { @@ -943,7 +943,7 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx, channel = consumer_find_channel(key); if (!channel) { - ERR("UST consumer get channel key %lu not found", key); + ERR("UST consumer get channel key %" PRIu64 " not found", key); ret_code = LTTNG_ERR_UST_CHAN_NOT_FOUND; goto end_msg_sessiond; } @@ -994,7 +994,7 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx, channel = consumer_find_channel(key); if (!channel) { - ERR("UST consumer get channel key %lu not found", key); + ERR("UST consumer get channel key %" PRIu64 " not found", key); ret_code = LTTNG_ERR_UST_CHAN_NOT_FOUND; goto end_msg_sessiond; } @@ -1033,11 +1033,12 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx, uint64_t offset = msg.u.push_metadata.target_offset; struct lttng_consumer_channel *channel; - DBG("UST consumer push metadata key %lu of len %lu", key, len); + DBG("UST consumer push metadata key %" PRIu64 " of len %" PRIu64, key, + len); channel = consumer_find_channel(key); if (!channel) { - ERR("UST consumer push metadata %lu not found", key); + ERR("UST consumer push metadata %" PRIu64 " not found", key); ret_code = LTTNG_ERR_UST_CHAN_NOT_FOUND; } @@ -1274,7 +1275,7 @@ int lttng_ustconsumer_read_subbuffer(struct lttng_consumer_stream *stream, * happen and it is OK with the code flow. */ DBG("Error writing to tracefile " - "(ret: %zd != len: %lu != subbuf_size: %lu)", + "(ret: %ld != len: %lu != subbuf_size: %lu)", ret, len, subbuf_size); } err = ustctl_put_next_subbuf(ustream); @@ -1433,7 +1434,7 @@ int lttng_ustconsumer_request_metadata(struct lttng_consumer_local_data *ctx, ret = lttcomm_recv_unix_sock(ctx->consumer_metadata_socket, &msg, sizeof(msg)); if (ret != sizeof(msg)) { - DBG("Consumer received unexpected message size %d (expects %lu)", + DBG("Consumer received unexpected message size %d (expects %zu)", ret, sizeof(msg)); lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_ERROR_RECV_CMD); /* -- 2.34.1