From: Adam C. Emerson <aemerson@redhat.com>
Date: Tue, 3 May 2016 16:53:33 +0000 (-0400)
Subject: test: Fix warnings in chain_xattr tests
X-Git-Tag: v11.0.0~732^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4252357d55e643552b00a6257a98ee88b7d9af69;p=ceph.git

test: Fix warnings in chain_xattr tests

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---

diff --git a/src/test/objectstore/chain_xattr.cc b/src/test/objectstore/chain_xattr.cc
index d3b4b1e9eea..475eb1665f6 100644
--- a/src/test/objectstore/chain_xattr.cc
+++ b/src/test/objectstore/chain_xattr.cc
@@ -298,30 +298,30 @@ TEST(chain_xattr, fskip_chain_cleanup_and_ensure_single_attr)
   memset(buf, sizeof(buf), 0x1F);
   // set chunked without either
   {
-    int r = chain_fsetxattr(fd, name, buf, sizeof(buf));
+    std::size_t r = chain_fsetxattr(fd, name, buf, sizeof(buf));
     ASSERT_EQ(r, sizeof(buf));
-    ASSERT_GT(get_xattrs(fd).size(), 1);
+    ASSERT_GT(get_xattrs(fd).size(), 1UL);
   }
 
   // verify
   {
     char buf2[sizeof(buf)*2];
-    int r = chain_fgetxattr(fd, name, buf2, sizeof(buf2));
+    std::size_t r = chain_fgetxattr(fd, name, buf2, sizeof(buf2));
     ASSERT_EQ(r, sizeof(buf));
     ASSERT_EQ(memcmp(buf, buf2, sizeof(buf)), 0);
   }
 
   // overwrite
   {
-    int r = chain_fsetxattr<false, true>(fd, name, buf, sizeof(buf));
-    ASSERT_EQ(r, sizeof (buf));
-    ASSERT_EQ(get_xattrs(fd).size(), 1);
+    std::size_t r = chain_fsetxattr<false, true>(fd, name, buf, sizeof(buf));
+    ASSERT_EQ(r, sizeof(buf));
+    ASSERT_EQ(get_xattrs(fd).size(), 1UL);
   }
 
   // verify
   {
     char buf2[sizeof(buf)*2];
-    int r = chain_fgetxattr(fd, name, buf2, sizeof(buf2));
+    std::size_t r = chain_fgetxattr(fd, name, buf2, sizeof(buf2));
     ASSERT_EQ(r, sizeof(buf));
     ASSERT_EQ(memcmp(buf, buf2, sizeof(buf)), 0);
   }
@@ -342,30 +342,30 @@ TEST(chain_xattr, skip_chain_cleanup_and_ensure_single_attr)
   memset(buf, sizeof(buf), 0x1F);
   // set chunked without either
   {
-    int r = chain_setxattr(file, name, buf, sizeof(buf));
+    std::size_t r = chain_setxattr(file, name, buf, sizeof(buf));
     ASSERT_EQ(r, sizeof(buf));
-    ASSERT_GT(get_xattrs(file).size(), 1);
+    ASSERT_GT(get_xattrs(file).size(), 1UL);
   }
 
   // verify
   {
     char buf2[sizeof(buf)*2];
-    int r = chain_getxattr(file, name, buf2, sizeof(buf2));
+    std::size_t r = chain_getxattr(file, name, buf2, sizeof(buf2));
     ASSERT_EQ(r, sizeof(buf));
     ASSERT_EQ(memcmp(buf, buf2, sizeof(buf)), 0);
   }
 
   // overwrite
   {
-    int r = chain_setxattr<false, true>(file, name, buf, sizeof(buf));
-    ASSERT_EQ(r, sizeof (buf));
-    ASSERT_EQ(get_xattrs(file).size(), 1);
+    std::size_t r = chain_setxattr<false, true>(file, name, buf, sizeof(buf));
+    ASSERT_EQ(r, sizeof(buf));
+    ASSERT_EQ(get_xattrs(file).size(), 1UL);
   }
 
   // verify
   {
     char buf2[sizeof(buf)*2];
-    int r = chain_getxattr(file, name, buf2, sizeof(buf2));
+    std::size_t r = chain_getxattr(file, name, buf2, sizeof(buf2));
     ASSERT_EQ(r, sizeof(buf));
     ASSERT_EQ(memcmp(buf, buf2, sizeof(buf)), 0);
   }