diff options
| author | Niels de Vos <ndevos@redhat.com> | 2016-07-16 14:21:47 +0200 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2016-07-17 06:36:58 -0700 |
| commit | 3af889f02722f4636d2ea30570de6477e8b5a3a9 (patch) | |
| tree | 1b80f4eb54ace923f5a82c0a8b2c7df808869063 | |
| parent | eb4ea14dcdf6dc2f741a2ed14150ee6ea83b92ce (diff) | |
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.
BUG: 1198849
Change-Id: I6f57b5e8ea174dd9e3056aff5da685e497894ccf
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/14933
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Smoke: Gluster Build System <jenkins@build.gluster.org>
| -rw-r--r-- | cli/src/cli-rpc-ops.c | 2 | ||||
| -rw-r--r-- | xlators/debug/trace/src/trace.c | 2 | ||||
| -rw-r--r-- | xlators/experimental/jbr-server/src/jbr.c | 2 | ||||
| -rw-r--r-- | xlators/features/changelog/lib/src/gf-changelog-reborp.c | 2 | ||||
| -rw-r--r-- | xlators/features/shard/src/shard.c | 2 | ||||
| -rw-r--r-- | xlators/storage/posix/src/posix.c | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index ea72fee3b98..40044dad753 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -9855,7 +9855,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/experimental/jbr-server/src/jbr.c b/xlators/experimental/jbr-server/src/jbr.c index e1eed3f6094..e07c511f4a9 100644 --- a/xlators/experimental/jbr-server/src/jbr.c +++ b/xlators/experimental/jbr-server/src/jbr.c @@ -1258,7 +1258,7 @@ jbr_next_entry (call_frame_t *frame, xlator_t *this) op_errno = EIO; gf_msg (this->name, GF_LOG_ERROR, 0, J_MSG_SYS_CALL_FAILURE, - "got %ld/%d bytes for next entry", + "got %zd/%d bytes for next entry", nbytes, CHANGELOG_ENTRY_SIZE); } goto err; diff --git a/xlators/features/changelog/lib/src/gf-changelog-reborp.c b/xlators/features/changelog/lib/src/gf-changelog-reborp.c index 28ebcfd0146..8fd01d0c77a 100644 --- a/xlators/features/changelog/lib/src/gf-changelog-reborp.c +++ b/xlators/features/changelog/lib/src/gf-changelog-reborp.c @@ -361,7 +361,7 @@ gf_changelog_event_handler (rpcsvc_request_t *req, } gf_msg_debug (this->name, 0, - "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 28f1a51d330..abac0ccf64d 100644 --- a/xlators/features/shard/src/shard.c +++ b/xlators/features/shard/src/shard.c @@ -4632,7 +4632,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 0d4bad96141..38f49df78ac 100644 --- a/xlators/storage/posix/src/posix.c +++ b/xlators/storage/posix/src/posix.c @@ -6437,8 +6437,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; } |