From 4f030852e3a4da367a948158cc8cf152e62bcee5 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Mon, 5 Sep 2016 16:53:38 +0200 Subject: build: correctly format some (s)size_t messages On 32-bit builds the are are warnings like these: posix.c:6438: warning: format '%ld' expects type 'long int', but argument 11 has type 'ssize_t' Instead of using "%l" for (signed) size_t variables, "%z" should be used. Cherry picked from commit 3af889f02722f4636d2ea30570de6477e8b5a3a9: > BUG: 1198849 > Change-Id: I6f57b5e8ea174dd9e3056aff5da685e497894ccf > Signed-off-by: Niels de Vos > Reviewed-on: http://review.gluster.org/14933 > NetBSD-regression: NetBSD Build System > CentOS-regression: Gluster Build System > Reviewed-by: Kaleb KEITHLEY > Smoke: Gluster Build System This patch is not really recommended for backporting, but we do have a new smoke test that fails when these warnings pop-up. It is cleaner to correct the code in the release-3.7 branch then to modify the smoke test to skip this branch. Change-Id: I6f57b5e8ea174dd9e3056aff5da685e497894ccf BUG: 1225842 Signed-off-by: Niels de Vos Reviewed-on: http://review.gluster.org/15401 NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Kaleb KEITHLEY Smoke: Gluster Build System --- cli/src/cli-rpc-ops.c | 2 +- xlators/debug/trace/src/trace.c | 2 +- xlators/features/changelog/lib/src/gf-changelog-reborp.c | 2 +- xlators/features/shard/src/shard.c | 2 +- xlators/storage/posix/src/posix.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index ea0a63bf748..5a3dcd52052 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -9749,7 +9749,7 @@ cli_populate_req_dict_for_delete (dict_t *snap_dict, dict_t *dict, size_t index) goto out; } - ret = snprintf (key, sizeof (key), "snapname%lu", index); + ret = snprintf (key, sizeof (key), "snapname%zu", index); if (ret < 0) { goto out; } diff --git a/xlators/debug/trace/src/trace.c b/xlators/debug/trace/src/trace.c index c809254eb17..03e92184dcd 100644 --- a/xlators/debug/trace/src/trace.c +++ b/xlators/debug/trace/src/trace.c @@ -2300,7 +2300,7 @@ trace_writev (call_frame_t *frame, xlator_t *this, fd_t *fd, snprintf (string, sizeof (string), "%"PRId64": gfid=%s fd=%p, count=%d, " - " offset=%"PRId64" flags=0%x write_size=%lu", + " offset=%"PRId64" flags=0%x write_size=%zu", frame->root->unique, uuid_utoa (fd->inode->gfid), fd, count, offset, flags, total_size); diff --git a/xlators/features/changelog/lib/src/gf-changelog-reborp.c b/xlators/features/changelog/lib/src/gf-changelog-reborp.c index 19c43cc8211..8534bce4b34 100644 --- a/xlators/features/changelog/lib/src/gf-changelog-reborp.c +++ b/xlators/features/changelog/lib/src/gf-changelog-reborp.c @@ -350,7 +350,7 @@ gf_changelog_event_handler (rpcsvc_request_t *req, } gf_log (this->name, GF_LOG_DEBUG, - "seq: %lu [%s] (time: %lu.%lu), (vec: %d, len: %ld)", + "seq: %lu [%s] (time: %lu.%lu), (vec: %d, len: %zd)", rpc_req.seq, entry->brick, rpc_req.tv_sec, rpc_req.tv_usec, payloadcnt, payloadlen); diff --git a/xlators/features/shard/src/shard.c b/xlators/features/shard/src/shard.c index c82fd0a31f1..b8dc5bbf249 100644 --- a/xlators/features/shard/src/shard.c +++ b/xlators/features/shard/src/shard.c @@ -4629,7 +4629,7 @@ shard_common_inode_write_begin (call_frame_t *frame, xlator_t *this, gf_msg_trace (this->name, 0, "%s: gfid=%s first_block=%"PRIu32" " "last_block=%"PRIu32" num_blocks=%"PRIu32" offset=%"PRId64"" - " total_size=%lu flags=%"PRId32"", gf_fop_list[fop], + " total_size=%zu flags=%"PRId32"", gf_fop_list[fop], uuid_utoa (fd->inode->gfid), local->first_block, local->last_block, local->num_blocks, offset, local->total_size, local->flags); diff --git a/xlators/storage/posix/src/posix.c b/xlators/storage/posix/src/posix.c index f58cd27473d..b42dda7f009 100644 --- a/xlators/storage/posix/src/posix.c +++ b/xlators/storage/posix/src/posix.c @@ -6387,8 +6387,8 @@ posix_rchecksum (call_frame_t *frame, xlator_t *this, if (bytes_read < 0) { gf_msg (this->name, GF_LOG_WARNING, errno, P_MSG_PREAD_FAILED, - "pread of %d bytes returned %ld ", - len, bytes_read); + "pread of %d bytes returned %zd", len, + bytes_read); op_errno = errno; } -- cgit