test_rgw: fix a number of unsigned/signed comparison warnings

Signed-off-by: Greg Farnum <greg@inktank.com>

diff --git a/src/test/test_rgw_admin_log.cc b/src/test/test_rgw_admin_log.cc
index 876c76973e05208f47dacd5d975d9b037bf954ec..df52ce5511715f7eabbb37c8f6c19c5fb963ba42 100644 (file)
--- a/src/test/test_rgw_admin_log.cc
+++ b/src/test/test_rgw_admin_log.cc
@@ -124,10 +124,12 @@ class test_helper {
 
 int test_helper::extract_input(int argc, char *argv[]){
 #define ERR_CHECK_NEXT_PARAM(o) \
-  if((loop + 1) >= argc)return -1; \
+  if((loop + 1) >= argcount)return -1; \
   else o = argv[loop+1];
 
-  for(unsigned loop = 1;loop < (unsigned)argc; loop += 2){
+  unsigned argcount = argc;
+
+  for(unsigned loop = 1;loop < argcount; loop += 2){
     if(strcmp(argv[loop], "-g") == 0){
       ERR_CHECK_NEXT_PARAM(host);
     }else if(strcmp(argv[loop],"-p") == 0){

diff --git a/src/test/test_rgw_admin_meta.cc b/src/test/test_rgw_admin_meta.cc
index f366c83c7824593a4a797e8748e71829b38a85e3..ccba4e5ea9b4dd6d4327ef470fe378d64e3d9306 100644 (file)
--- a/src/test/test_rgw_admin_meta.cc
+++ b/src/test/test_rgw_admin_meta.cc
@@ -118,10 +118,12 @@ class test_helper {
 
 int test_helper::extract_input(int argc, char *argv[]){
 #define ERR_CHECK_NEXT_PARAM(o) \
-  if((loop + 1) >= argc)return -1; \
+  if((loop + 1) >= argcount)return -1; \
   else o = argv[loop+1];
 
-  for(unsigned loop = 1;loop < (unsigned)argc; loop += 2){
+  unsigned argcount = argc;
+
+  for(unsigned loop = 1;loop < argcount; loop += 2){
     if(strcmp(argv[loop], "-g") == 0){
       ERR_CHECK_NEXT_PARAM(host);
     }else if(strcmp(argv[loop],"-p") == 0){

diff --git a/src/test/test_rgw_admin_opstate.cc b/src/test/test_rgw_admin_opstate.cc
index cfd709043dd60065c3c2967aa66942f01761caa1..ed0c5472f2ad3a69e5de64c2b0b8c371e563c3b9 100644 (file)
--- a/src/test/test_rgw_admin_opstate.cc
+++ b/src/test/test_rgw_admin_opstate.cc
@@ -121,10 +121,12 @@ class test_helper {
 
 int test_helper::extract_input(int argc, char *argv[]){
 #define ERR_CHECK_NEXT_PARAM(o) \
-  if((loop + 1) >= argc)return -1; \
+  if((loop + 1) >= argcount)return -1; \
   else o = argv[loop+1];
 
-  for(unsigned loop = 1;loop < (unsigned)argc; loop += 2){
+  unsigned argcount = argc;
+
+  for(unsigned loop = 1; loop < argcount; loop += 2){
     if(strcmp(argv[loop], "-g") == 0){
       ERR_CHECK_NEXT_PARAM(host);
     }else if(strcmp(argv[loop],"-p") == 0){
@@ -575,7 +577,7 @@ TEST(TestRGWAdmin, opstate_set_list_delete) {
     EXPECT_TRUE((*it).client_id.compare(cid_1) == 0);
     EXPECT_TRUE((*it).op_id.compare(oid_1) == 0);
     EXPECT_TRUE((*it).object.compare(obj_1) == 0);
-    EXPECT_EQ((*it).state, RGWOpState::OPSTATE_IN_PROGRESS);
+    EXPECT_EQ((*it).state, (uint32_t)RGWOpState::OPSTATE_IN_PROGRESS);
   }
 
   state = "complete";
@@ -600,7 +602,7 @@ TEST(TestRGWAdmin, opstate_set_list_delete) {
     EXPECT_TRUE((*it).client_id.compare(cid_1) == 0);
     EXPECT_TRUE((*it).op_id.compare(oid_1) == 0);
     EXPECT_TRUE((*it).object.compare(obj_1) == 0);
-    EXPECT_EQ((*it).state, RGWOpState::OPSTATE_COMPLETE);
+    EXPECT_EQ((*it).state, (uint32_t)RGWOpState::OPSTATE_COMPLETE);
   }
 
   ss.str("");
@@ -624,13 +626,13 @@ TEST(TestRGWAdmin, opstate_set_list_delete) {
     EXPECT_TRUE((*it).client_id.compare(cid_1) == 0);
     EXPECT_TRUE((*it).op_id.compare(oid_1) == 0);
     EXPECT_TRUE((*it).object.compare(obj_1) == 0);
-    EXPECT_EQ((*it).state, RGWOpState::OPSTATE_COMPLETE);
+    EXPECT_EQ((*it).state, (uint32_t)RGWOpState::OPSTATE_COMPLETE);
 
     it++;
     EXPECT_TRUE((*it).client_id.compare(cid_2) == 0);
     EXPECT_TRUE((*it).op_id.compare(oid_2) == 0);
     EXPECT_TRUE((*it).object.compare(obj_2) == 0);
-    EXPECT_EQ((*it).state, RGWOpState::OPSTATE_COMPLETE);
+    EXPECT_EQ((*it).state, (uint32_t)RGWOpState::OPSTATE_COMPLETE);
   }
 
   entries.clear();