From 489bca16fba26df6b729a6823d6421f9668aa330 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Mon, 16 Mar 2015 00:14:00 +0100 Subject: [PATCH] fix a few minor compilation warnings Signed-off-by: Loic Dachary --- src/rbd_fuse/rbd-fuse.cc | 2 +- src/rgw/rgw_common.h | 2 +- src/rgw/rgw_rados.cc | 4 ++-- src/test/librbd/test_librbd.cc | 17 +++++++++-------- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/rbd_fuse/rbd-fuse.cc b/src/rbd_fuse/rbd-fuse.cc index c53e5b6c3dfa..58d3e2a5e187 100644 --- a/src/rbd_fuse/rbd-fuse.cc +++ b/src/rbd_fuse/rbd-fuse.cc @@ -349,7 +349,7 @@ static int rbdfs_write(const char *path, const char *buf, size_t size, while (size > 0) { ssize_t ret; - if (offset + size > rbdsize(fi->fh)) { + if ((size_t)(offset + size) > rbdsize(fi->fh)) { int r; fprintf(stderr, "rbdfs_write resizing %s to 0x%"PRIxMAX"\n", path, offset+size); diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h index 75f72281dadb..0a796c08deaf 100644 --- a/src/rgw/rgw_common.h +++ b/src/rgw/rgw_common.h @@ -149,7 +149,7 @@ using ceph::crypto::MD5; #define ERR_INTERNAL_ERROR 2200 #ifndef UINT32_MAX -#define UINT32_MAX (4294967295) +#define UINT32_MAX (0xffffffffu) #endif typedef void *RGWAccessHandle; diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 2f7c7af1b30b..b5efc81fba8e 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -6603,9 +6603,9 @@ int RGWRados::get_bucket_stats(rgw_bucket& bucket, string *bucket_ver, string *m char buf[64]; for(; iter != headers.end(); ++iter, ++viter) { accumulate_raw_stats(iter->second, stats); - snprintf(buf, sizeof(buf), "%lu", iter->second.ver); + snprintf(buf, sizeof(buf), "%lu", (unsigned long)iter->second.ver); ver_mgr.add(viter->first, string(buf)); - snprintf(buf, sizeof(buf), "%lu", iter->second.master_ver); + snprintf(buf, sizeof(buf), "%lu", (unsigned long)iter->second.master_ver); master_ver_mgr.add(viter->first, string(buf)); marker_mgr.add(viter->first, iter->second.max_marker); } diff --git a/src/test/librbd/test_librbd.cc b/src/test/librbd/test_librbd.cc index cf76c67c7b64..68b634bfa44e 100644 --- a/src/test/librbd/test_librbd.cc +++ b/src/test/librbd/test_librbd.cc @@ -1450,8 +1450,8 @@ TEST_F(TestLibRBD, TestCoR) // make a parent to clone from ASSERT_EQ(0, create_image_full(ioctx, "parent", image_size, &order, false, features)); ASSERT_EQ(0, rbd_open(ioctx, "parent", &parent, NULL)); - printf("made parent image \"parent\": %ldK (%d * %dK)\n", - image_size, object_num, object_size/1024); + printf("made parent image \"parent\": %ldK (%d * %dK)\n", + (unsigned long)image_size, object_num, object_size/1024); // write something into parent char test_data[TEST_IO_SIZE + 1]; @@ -1477,18 +1477,19 @@ TEST_F(TestLibRBD, TestCoR) printf("generated random write map:\n"); for (map::iterator itr = write_tracker.begin(); itr != write_tracker.end(); ++itr) - printf("\t [%-8ld, %-8ld]\n", itr->first, itr->second); + printf("\t [%-8ld, %-8ld]\n", + (unsigned long)itr->first, (unsigned long)itr->second); printf("write data based on random map\n"); for (map::iterator itr = write_tracker.begin(); itr != write_tracker.end(); ++itr) { - printf("\twrite object-%-4ld\t", itr->first); + printf("\twrite object-%-4ld\t", (unsigned long)itr->first); ASSERT_PASSED(write_test_data, parent, test_data, itr->first * object_size + itr->second, TEST_IO_SIZE, 0); } for (map::iterator itr = write_tracker.begin(); itr != write_tracker.end(); ++itr) { - printf("\tread object-%-4ld\t", itr->first); + printf("\tread object-%-4ld\t", (unsigned long)itr->first); ASSERT_PASSED(read_test_data, parent, test_data, itr->first * object_size + itr->second, TEST_IO_SIZE, 0); } @@ -1522,20 +1523,20 @@ TEST_F(TestLibRBD, TestCoR) printf("read from \"child\"\n"); { map::iterator itr = write_tracker.begin(); - printf("\tread object-%-4ld\t", itr->first); + printf("\tread object-%-4ld\t", (unsigned long)itr->first); ASSERT_PASSED(read_test_data, child, test_data, itr->first * object_size + itr->second, TEST_IO_SIZE, 0); } for (map::iterator itr = write_tracker.begin(); itr != write_tracker.end(); ++itr) { - printf("\tread object-%-4ld\t", itr->first); + printf("\tread object-%-4ld\t", (unsigned long)itr->first); ASSERT_PASSED(read_test_data, child, test_data, itr->first * object_size + itr->second, TEST_IO_SIZE, 0); } printf("read again reversely\n"); for (map::iterator itr = --write_tracker.end(); itr != write_tracker.begin(); --itr) { - printf("\tread object-%-4ld\t", itr->first); + printf("\tread object-%-4ld\t", (unsigned long)itr->first); ASSERT_PASSED(read_test_data, child, test_data, itr->first * object_size + itr->second, TEST_IO_SIZE, 0); } -- 2.47.3