diff options
| author | Niels de Vos <ndevos@redhat.com> | 2016-09-06 16:13:25 +0200 | 
|---|---|---|
| committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2016-09-07 07:00:48 -0700 | 
| commit | 020787a93f997f4fd2e16818e73d030b3ef4e4e8 (patch) | |
| tree | 1fb56daf4bccc3059afae77f9ebb6530ff1d0fb6 | |
| parent | 2b2b301d6b8a9781525d938e3896069bcfc60909 (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.
Cherry picked from commit 3af889f02722f4636d2ea30570de6477e8b5a3a9:
> 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>
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: 1373530
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/15410
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: 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/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 | 
5 files changed, 6 insertions, 6 deletions
diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index b8a19243159..0363c60d345 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -9864,7 +9864,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 4c49e9a533f..2b9b295f212 100644 --- a/xlators/features/changelog/lib/src/gf-changelog-reborp.c +++ b/xlators/features/changelog/lib/src/gf-changelog-reborp.c @@ -362,7 +362,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 5295697cc94..cecf5dcb66d 100644 --- a/xlators/storage/posix/src/posix.c +++ b/xlators/storage/posix/src/posix.c @@ -6449,8 +6449,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;                  }  | 
