From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Wed, 13 Feb 2013 14:45:27 +0000 (+0100)
Subject: rgw/rgw_admin.cc: use empty() instead of size() to check for emptiness
X-Git-Tag: v0.58~66^2~36
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=338e168015f33b65e61fc680138b04393cc9a893;p=ceph.git

rgw/rgw_admin.cc: use empty() instead of size() to check for emptiness

Use empty() since it should be prefered as it has, following the
standard, a constant time complexity regardless of the containter
type. The same is not guaranteed for size().

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

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index febdfc460990..2095238874aa 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -749,7 +749,7 @@ static int remove_bucket(RGWRados *store, rgw_bucket& bucket, bool delete_childr
     if (ret < 0)
       return ret;
 
-    while (objs.size() > 0) {
+    while (!objs.empty()) {
       std::vector<RGWObjEnt>::iterator it = objs.begin();
       for (it = objs.begin(); it != objs.end(); it++) {
         ret = remove_object(store, bucket, (*it).name);
@@ -944,7 +944,7 @@ int main(int argc, char **argv)
     }
   }
 
-  if (args.size() == 0) {
+  if (args.empty()) {
     return usage();
   }
   else {
@@ -1557,7 +1557,7 @@ next:
     if (rgw_read_user_buckets(store, user_id, buckets, false) >= 0) {
       map<string, RGWBucketEnt>& m = buckets.get_buckets();
 
-      if (m.size() > 0 && purge_data) {
+      if (!m.empty() && purge_data) {
         for (std::map<string, RGWBucketEnt>::iterator it = m.begin(); it != m.end(); it++) {
           ret = remove_bucket(store, ((*it).second).bucket, true);
 
@@ -1566,7 +1566,7 @@ next:
         }
       }
 
-      if (m.size() > 0 && !purge_data) {
+      if (!m.empty() && !purge_data) {
         cerr << "ERROR: specify --purge-data to remove a user with a non-empty bucket list" << std::endl;
         return 1;
       }