From: zhangwen <zhangwen1@unionpay.com>
Date: Fri, 15 Sep 2017 02:14:45 +0000 (+0800)
Subject: rgw: Rename variables to consistent with ceph naming convention
X-Git-Tag: v13.0.1~781^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bd426ac397996c747cd8e0a5b0b41bbe0c218692;p=ceph.git

rgw: Rename variables to consistent with ceph naming convention

Signed-off-by: Wen Zhang zhangwen1@unionpay.com
---

diff --git a/src/rgw/rgw_iam_policy.cc b/src/rgw/rgw_iam_policy.cc
index c151574646b..2f6d8be81c2 100644
--- a/src/rgw/rgw_iam_policy.cc
+++ b/src/rgw/rgw_iam_policy.cc
@@ -792,8 +792,8 @@ static optional<Principal> parse_principal(CephContext* cct, TokenID t,
 bool ParseState::do_string(CephContext* cct, const char* s, size_t l) {
   auto k = pp->tokens.lookup(s, l);
   Policy& p = pp->policy;
-  bool isAction = false;
-  bool isValidAction = false;
+  bool is_action = false;
+  bool is_validaction = false;
   Statement* t = p.statements.empty() ? nullptr : &(p.statements.back());
 
   // Top level!
@@ -816,10 +816,10 @@ bool ParseState::do_string(CephContext* cct, const char* s, size_t l) {
     t->noprinc.emplace(Principal::wildcard());
   } else if ((w->id == TokenID::Action) ||
 	     (w->id == TokenID::NotAction)) {
-    isAction = true;
+    is_action = true;
     for (auto& p : actpairs) {
       if (match_policy({s, l}, p.name, MATCH_POLICY_ACTION)) {
-        isValidAction = true;
+        is_validaction = true;
 	(w->id == TokenID::Action ? t->action : t->notaction) |= p.bit;
       }
     }
@@ -861,7 +861,7 @@ bool ParseState::do_string(CephContext* cct, const char* s, size_t l) {
     pp->s.pop_back();
   }
 
-  if (isAction && !isValidAction){
+  if (is_action && !is_validaction){
     return false;
   }