From 4f6d217277ce3a6a4b648560233e8f20b21b8e47 Mon Sep 17 00:00:00 2001
From: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Date: Sat, 9 Apr 2016 01:05:04 +0200
Subject: [PATCH] rgw: ONLY refactor RGWAccessControlPolicy_SWIFT[Acct].

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
---
 src/rgw/rgw_acl_swift.cc | 16 ++++++++++------
 src/rgw/rgw_acl_swift.h  | 22 ++++++++++++----------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/rgw/rgw_acl_swift.cc b/src/rgw/rgw_acl_swift.cc
index de48b82a89129..d75f699122af0 100644
--- a/src/rgw/rgw_acl_swift.cc
+++ b/src/rgw/rgw_acl_swift.cc
@@ -22,7 +22,7 @@ using namespace std;
 
 #define SWIFT_GROUP_ALL_USERS ".r:*"
 
-static int parse_list(string& uid_list, list<string>& uids)
+static int parse_list(const string& uid_list, list<string>& uids)
 {
   char *s = strdup(uid_list.c_str());
   if (!s) {
@@ -62,13 +62,13 @@ static bool uid_is_public(const string& uid)
          sub.compare(".referrer") == 0;
 }
 
-void RGWAccessControlPolicy_SWIFT::add_grants(RGWRados *store, list<string>& uids, int perm)
+void RGWAccessControlPolicy_SWIFT::add_grants(RGWRados * const store,
+                                              const list<string>& uids,
+                                              const int perm)
 {
-  list<string>::iterator iter;
-  for (iter = uids.begin(); iter != uids.end(); ++iter ) {
+  for (const auto& uid : uids) {
     ACLGrant grant;
     RGWUserInfo grant_user;
-    string& uid = *iter;
     if (uid_is_public(uid)) {
       grant.set_group(ACL_GROUP_ALL_USERS, perm);
       acl.add_grant(&grant);
@@ -85,7 +85,11 @@ void RGWAccessControlPolicy_SWIFT::add_grants(RGWRados *store, list<string>& uid
   }
 }
 
-bool RGWAccessControlPolicy_SWIFT::create(RGWRados *store, rgw_user& id, string& name, string& read_list, string& write_list)
+bool RGWAccessControlPolicy_SWIFT::create(RGWRados * const store,
+                                          const rgw_user& id,
+                                          const std::string& name,
+                                          const std::string& read_list,
+                                          const std::string& write_list)
 {
   acl.create_default(id, name);
   owner.set_id(id);
diff --git a/src/rgw/rgw_acl_swift.h b/src/rgw/rgw_acl_swift.h
index 551ceac899467..672a502e952fd 100644
--- a/src/rgw/rgw_acl_swift.h
+++ b/src/rgw/rgw_acl_swift.h
@@ -14,24 +14,26 @@
 class RGWAccessControlPolicy_SWIFT : public RGWAccessControlPolicy
 {
 public:
-  explicit RGWAccessControlPolicy_SWIFT(CephContext *_cct) : RGWAccessControlPolicy(_cct) {}
+  explicit RGWAccessControlPolicy_SWIFT(CephContext * const cct)
+    : RGWAccessControlPolicy(cct) {
+  }
   ~RGWAccessControlPolicy_SWIFT() {}
 
-  void add_grants(RGWRados *store,
-                  std::list<string>& uids, int perm);
-  bool create(RGWRados *store, rgw_user& id,
-              std::string& name,
-              std::string& read_list,
-              std::string& write_list);
+  void add_grants(RGWRados *store, const std::list<string>& uids, int perm);
+  bool create(RGWRados *store,
+              const rgw_user& id,
+              const std::string& name,
+              const std::string& read_list,
+              const std::string& write_list);
   void to_str(std::string& read, std::string& write);
 };
 
 class RGWAccessControlPolicy_SWIFTAcct : public RGWAccessControlPolicy
 {
 public:
-  RGWAccessControlPolicy_SWIFTAcct(CephContext * const _cct)
-    : RGWAccessControlPolicy(_cct)
-  {}
+  RGWAccessControlPolicy_SWIFTAcct(CephContext * const cct)
+    : RGWAccessControlPolicy(cct) {
+  }
   ~RGWAccessControlPolicy_SWIFTAcct() {}
 
   void add_grants(RGWRados *store, const std::list<string>& uids, int perm);
-- 
2.39.5