]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw/rgw_gc.cc: silence cppcheck
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Tue, 11 Nov 2014 14:46:07 +0000 (15:46 +0100)
committerDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Thu, 13 Nov 2014 22:39:08 +0000 (23:39 +0100)
Silence cppcheck warning about std::remove, clarify the
used remove() function from RGWGC.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
src/rgw/rgw_gc.cc

index b12b634db97d66a6da2f2b33a15cb1615b62a405..d7d5716225da62dc3ff5191dd2d99407913fcbc4 100644 (file)
@@ -213,7 +213,7 @@ int RGWGC::process(int index, int max_secs)
         remove_tags.push_back(info.tag);
 #define MAX_REMOVE_CHUNK 16
         if (remove_tags.size() > MAX_REMOVE_CHUNK) {
-          remove(index, remove_tags);
+          RGWGC::remove(index, remove_tags);
           remove_tags.clear();
         }
       }
@@ -222,7 +222,7 @@ int RGWGC::process(int index, int max_secs)
 
 done:
   if (!remove_tags.empty())
-    remove(index, remove_tags);
+    RGWGC::remove(index, remove_tags);
   l.unlock(&store->gc_pool_ctx, obj_names[index]);
   delete ctx;
   return 0;