From 4252357d55e643552b00a6257a98ee88b7d9af69 Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Tue, 3 May 2016 12:53:33 -0400 Subject: [PATCH] test: Fix warnings in chain_xattr tests Signed-off-by: Adam C. Emerson --- src/test/objectstore/chain_xattr.cc | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/test/objectstore/chain_xattr.cc b/src/test/objectstore/chain_xattr.cc index d3b4b1e9eeafa..475eb1665f6b8 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(fd, name, buf, sizeof(buf)); - ASSERT_EQ(r, sizeof (buf)); - ASSERT_EQ(get_xattrs(fd).size(), 1); + std::size_t r = chain_fsetxattr(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(file, name, buf, sizeof(buf)); - ASSERT_EQ(r, sizeof (buf)); - ASSERT_EQ(get_xattrs(file).size(), 1); + std::size_t r = chain_setxattr(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); } -- 2.39.5