From ac8b57c2caa09ad356f75ebde9be509b3b848819 Mon Sep 17 00:00:00 2001 From: Orit Wasserman Date: Mon, 3 Apr 2017 20:27:56 +0300 Subject: [PATCH] rgw: more c++1 loop style Signed-off-by: Orit Wasserman --- src/rgw/rgw_rest_s3.cc | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc index d22d68c01abb..31e1fe165989 100644 --- a/src/rgw/rgw_rest_s3.cc +++ b/src/rgw/rgw_rest_s3.cc @@ -468,7 +468,7 @@ void RGWGetUsage_ObjStore_S3::send_response() } formatter->close_section(); // entries } - + if (show_log_sum) { formatter->open_array_section("Summary"); map::iterator siter; @@ -484,19 +484,19 @@ void RGWGetUsage_ObjStore_S3::send_response() formatter->dump_int("BytesReceived", total_usage.bytes_received); formatter->dump_int("Ops", total_usage.ops); formatter->dump_int("SuccessfulOps", total_usage.successful_ops); - formatter->close_section(); // total + formatter->close_section(); // total formatter->close_section(); // user } if (s->cct->_conf->rgw_rest_getusage_op_compat) { - formatter->open_object_section("Stats"); - } - + formatter->open_object_section("Stats"); + } + formatter->dump_int("TotalBytes", header.stats.total_bytes); formatter->dump_int("TotalBytesRounded", header.stats.total_bytes_rounded); formatter->dump_int("TotalEntries", header.stats.total_entries); - - if (s->cct->_conf->rgw_rest_getusage_op_compat) { + + if (s->cct->_conf->rgw_rest_getusage_op_compat) { formatter->close_section(); //Stats } @@ -506,15 +506,14 @@ void RGWGetUsage_ObjStore_S3::send_response() formatter->open_array_section("CapacityUsed"); formatter->open_object_section("User"); formatter->open_array_section("Buckets"); - map::iterator biter; - for (biter = buckets_usage.begin(); biter != buckets_usage.end(); ++biter) { - const cls_user_bucket_entry& entry = biter->second; - dump_usage_bucket_info(formatter, biter->first, entry); + for (const auto& biter : buckets_usage) { + const cls_user_bucket_entry& entry = biter.second; + dump_usage_bucket_info(formatter, biter.first, entry); } - formatter->close_section(); // Buckets - formatter->close_section(); // User + formatter->close_section(); // Buckets + formatter->close_section(); // User formatter->close_section(); // CapacityUsed - + formatter->close_section(); // usage rgw_flush_formatter_and_reset(s, s->formatter); } -- 2.47.3