From 0682f8722da57699fcbbda014fb318790244e108 Mon Sep 17 00:00:00 2001 From: Orit Wasserman Date: Thu, 30 Mar 2017 18:21:48 +0300 Subject: [PATCH] rgw: use c++11 loops for cls_user_get_bucket_stats and rgw_user_get_all_buckets_stats Signed-off-by: Orit Wasserman --- src/rgw/rgw_rados.cc | 16 ++++++---------- src/rgw/rgw_user.cc | 8 +++----- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index ac35573a0dd..8e80989b348 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -12443,11 +12443,9 @@ int RGWRados::cls_user_sync_bucket_stats(rgw_raw_obj& user_obj, const RGWBucketI bucket_info.bucket.convert(&entry.bucket); - map::iterator hiter = headers.begin(); - for (; hiter != headers.end(); ++hiter) { - map::iterator iter = hiter->second.stats.begin(); - for (; iter != hiter->second.stats.end(); ++iter) { - struct rgw_bucket_category_stats& header_stats = iter->second; + for (auto hiter : headers) { + for (const auto& iter : hiter.second.stats) { + const struct rgw_bucket_category_stats& header_stats = iter.second; entry.size += header_stats.total_size; entry.size_rounded += header_stats.total_size_rounded; entry.count += header_stats.num_entries; @@ -12484,11 +12482,9 @@ int RGWRados::cls_user_get_bucket_stats(rgw_bucket& bucket, cls_user_bucket_entr bucket.convert(&entry.bucket); - map::iterator hiter = headers.begin(); - for (; hiter != headers.end(); ++hiter) { - map::iterator iter = hiter->second.stats.begin(); - for (; iter != hiter->second.stats.end(); ++iter) { - struct rgw_bucket_category_stats& header_stats = iter->second; + for (const auto& hiter : headers) { + for (const auto& iter : hiter.second.stats) { + const struct rgw_bucket_category_stats& header_stats = iter.second; entry.size += header_stats.total_size; entry.size_rounded += header_stats.total_size_rounded; entry.count += header_stats.num_entries; diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc index 95bdab3a4a3..b8e6fd261cf 100644 --- a/src/rgw/rgw_user.cc +++ b/src/rgw/rgw_user.cc @@ -107,12 +107,10 @@ int rgw_user_get_all_buckets_stats(RGWRados *store, const rgw_user& user_id, map return ret; } map& buckets = user_buckets.get_buckets(); - for (map::iterator i = buckets.begin(); - i != buckets.end(); - ++i) { - marker = i->first; + for (auto i : buckets) { + marker = i.first; - RGWBucketEnt& bucket_ent = i->second; + RGWBucketEnt& bucket_ent = i.second; cls_user_bucket_entry entry; ret = store->cls_user_get_bucket_stats(bucket_ent.bucket, entry); if (ret < 0) { -- 2.47.3