From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Fri, 13 Oct 2017 22:40:04 +0000 (+0200)
Subject: librbd/test_internal.cc: fix format qualifiers to %lu
X-Git-Tag: v13.0.1~358^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f250b9c32e9b833fcf3b85e9f38b916d6dddf2f5;p=ceph.git

librbd/test_internal.cc: fix format qualifiers to %lu

Fix for:

[src/test/librbd/test_internal.cc:1054]: (warning) %ld in format string
 (no. 1) requires 'long' but the argument type is 'unsigned long'.
[src/test/librbd/test_internal.cc:1054]: (warning) %ld in format string
 (no. 2) requires 'long' but the argument type is 'unsigned long'.
[src/test/librbd/test_internal.cc:1063]: (warning) %ld in format string
 (no. 1) requires 'long' but the argument type is 'unsigned long'.
[src/test/librbd/test_internal.cc:1073]: (warning) %ld in format string
 (no. 1) requires 'long' but the argument type is 'unsigned long'.
[src/test/librbd/test_internal.cc:1114]: (warning) %ld in format string
 (no. 1) requires 'long' but the argument type is 'unsigned long'.
[src/test/librbd/test_internal.cc:1121]: (warning) %ld in format string
 (no. 1) requires 'long' but the argument type is 'unsigned long'.
[src/test/librbd/test_internal.cc:1129]: (warning) %ld in format string
 (no. 1) requires 'long' but the argument type is 'unsigned long'.
[src/test/librbd/test_internal.cc:1196]: (warning) %ld in format string
 (no. 1) requires 'long' but the argument type is 'unsigned long'.
[src/test/librbd/test_internal.cc:1196]: (warning) %ld in format string
 (no. 2) requires 'long' but the argument type is 'unsigned long'.
[src/test/librbd/test_internal.cc:1205]: (warning) %ld in format string
 (no. 1) requires 'long' but the argument type is 'unsigned long'.
[src/test/librbd/test_internal.cc:1215]: (warning) %ld in format string
 (no. 1) requires 'long' but the argument type is 'unsigned long'.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/test/librbd/test_internal.cc b/src/test/librbd/test_internal.cc
index d9cc73458cfe7..9f68c248e61a9 100644
--- a/src/test/librbd/test_internal.cc
+++ b/src/test/librbd/test_internal.cc
@@ -1071,7 +1071,7 @@ TEST_F(TestInternal, TestCoR)
   printf("generated random write map:\n");
   for (map<uint64_t, uint64_t>::iterator itr = write_tracker.begin();
        itr != write_tracker.end(); ++itr)
-    printf("\t [%-8ld, %-8ld]\n",
+    printf("\t [%-8lu, %-8lu]\n",
            (unsigned long)itr->first, (unsigned long)itr->second);
 
   bufferlist bl;
@@ -1080,7 +1080,7 @@ TEST_F(TestInternal, TestCoR)
   printf("write data based on random map\n");
   for (map<uint64_t, uint64_t>::iterator itr = write_tracker.begin();
        itr != write_tracker.end(); ++itr) {
-    printf("\twrite object-%-4ld\t\n", (unsigned long)itr->first);
+    printf("\twrite object-%-4lu\t\n", (unsigned long)itr->first);
     ASSERT_EQ(TEST_IO_SIZE, image.write(itr->second, TEST_IO_SIZE, bl));
   }
 
@@ -1090,7 +1090,7 @@ TEST_F(TestInternal, TestCoR)
   printf("verify written data by reading\n");
   {
     map<uint64_t, uint64_t>::iterator itr = write_tracker.begin();
-    printf("\tread object-%-4ld\n", (unsigned long)itr->first);
+    printf("\tread object-%-4lu\n", (unsigned long)itr->first);
     ASSERT_EQ(TEST_IO_SIZE, image.read(itr->second, TEST_IO_SIZE, readbl));
     ASSERT_TRUE(readbl.contents_equal(bl));
   }
@@ -1131,14 +1131,14 @@ TEST_F(TestInternal, TestCoR)
   printf("read from \"child\"\n");
   {
     map<uint64_t, uint64_t>::iterator itr = write_tracker.begin();
-    printf("\tread object-%-4ld\n", (unsigned long)itr->first);
+    printf("\tread object-%-4lu\n", (unsigned long)itr->first);
     ASSERT_EQ(TEST_IO_SIZE, image.read(itr->second, TEST_IO_SIZE, readbl));
     ASSERT_TRUE(readbl.contents_equal(bl));
   }
 
   for (map<uint64_t, uint64_t>::iterator itr = write_tracker.begin();
        itr != write_tracker.end(); ++itr) {
-    printf("\tread object-%-4ld\n", (unsigned long)itr->first);
+    printf("\tread object-%-4lu\n", (unsigned long)itr->first);
     ASSERT_EQ(TEST_IO_SIZE, image.read(itr->second, TEST_IO_SIZE, readbl));
     ASSERT_TRUE(readbl.contents_equal(bl));
   }
@@ -1146,7 +1146,7 @@ TEST_F(TestInternal, TestCoR)
   printf("read again reversely\n");
   for (map<uint64_t, uint64_t>::iterator itr = --write_tracker.end();
        itr != write_tracker.begin(); --itr) {
-    printf("\tread object-%-4ld\n", (unsigned long)itr->first);
+    printf("\tread object-%-4lu\n", (unsigned long)itr->first);
     ASSERT_EQ(TEST_IO_SIZE, image.read(itr->second, TEST_IO_SIZE, readbl));
     ASSERT_TRUE(readbl.contents_equal(bl));
   }
@@ -1213,7 +1213,7 @@ TEST_F(TestInternal, FlattenNoEmptyObjects)
   printf("generated random write map:\n");
   for (map<uint64_t, uint64_t>::iterator itr = write_tracker.begin();
        itr != write_tracker.end(); ++itr)
-    printf("\t [%-8ld, %-8ld]\n",
+    printf("\t [%-8lu, %-8lu]\n",
            (unsigned long)itr->first, (unsigned long)itr->second);
 
   bufferlist bl;
@@ -1222,7 +1222,7 @@ TEST_F(TestInternal, FlattenNoEmptyObjects)
   printf("write data based on random map\n");
   for (map<uint64_t, uint64_t>::iterator itr = write_tracker.begin();
        itr != write_tracker.end(); ++itr) {
-    printf("\twrite object-%-4ld\t\n", (unsigned long)itr->first);
+    printf("\twrite object-%-4lu\t\n", (unsigned long)itr->first);
     ASSERT_EQ(TEST_IO_SIZE, image.write(itr->second, TEST_IO_SIZE, bl));
   }
 
@@ -1232,7 +1232,7 @@ TEST_F(TestInternal, FlattenNoEmptyObjects)
   printf("verify written data by reading\n");
   {
     map<uint64_t, uint64_t>::iterator itr = write_tracker.begin();
-    printf("\tread object-%-4ld\n", (unsigned long)itr->first);
+    printf("\tread object-%-4lu\n", (unsigned long)itr->first);
     ASSERT_EQ(TEST_IO_SIZE, image.read(itr->second, TEST_IO_SIZE, readbl));
     ASSERT_TRUE(readbl.contents_equal(bl));
   }