From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Tue, 2 Apr 2013 14:15:27 +0000 (+0200)
Subject: rgw/rgw_user.cc: reduce scope of same_email in execute_modify()
X-Git-Tag: v0.62~102^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=84b1914b787018f39cf22aebed7bc93c25a19801;p=ceph.git

rgw/rgw_user.cc: reduce scope of same_email in execute_modify()

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

diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc
index dd3990ac652..7ba9ae3c3f0 100644
--- a/src/rgw/rgw_user.cc
+++ b/src/rgw/rgw_user.cc
@@ -1752,7 +1752,6 @@ int RGWUser::remove(RGWUserAdminOpState& op_state, std::string *err_msg)
 
 int RGWUser::execute_modify(RGWUserAdminOpState& op_state, std::string *err_msg)
 {
-  bool same_email = false;
   bool populated = op_state.is_populated();
   bool defer_user_update = true;
   int ret = 0;
@@ -1787,6 +1786,7 @@ int RGWUser::execute_modify(RGWUserAdminOpState& op_state, std::string *err_msg)
   user_info = old_info;
 
   std::string old_email = old_info.user_email;
+  bool same_email = false;
   if (!op_email.empty()) {
     same_email = (old_email.compare(op_email) == 0);