From: Sage Weil <sage.weil@dreamhost.com>
Date: Sun, 21 Aug 2011 21:18:05 +0000 (-0700)
Subject: moncaps: fix shadow
X-Git-Tag: v0.35~303
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b3821cc592e57ed13f8aef081f992eb43ce91a26;p=ceph.git

moncaps: fix shadow

Coverity cid 30

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
---

diff --git a/src/mon/MonCaps.cc b/src/mon/MonCaps.cc
index 4f8490b67731..5145aa2fcb42 100644
--- a/src/mon/MonCaps.cc
+++ b/src/mon/MonCaps.cc
@@ -182,17 +182,17 @@ do { \
           if (got_eq) {
             ASSERT_STATE((services_list.size() > 0) ||
 			 (uid_list.size() > 0));
-            list<int>::iterator iter;
-            for (iter = services_list.begin(); iter != services_list.end(); ++iter) {
-              MonCap& cap = services_map[*iter];
+            
+            for (list<int>::iterator i = services_list.begin(); i != services_list.end(); ++i) {
+              MonCap& cap = services_map[*i];
               if (op_allow) {
                 cap.allow |= cap_val;
               } else {
                 cap.deny |= cap_val;
               }
             }
-	    for (iter = uid_list.begin(); iter != uid_list.end(); ++iter) {
-	      MonCap& cap = pool_auid_map[*iter];
+	    for (list<int>::iterator i = uid_list.begin(); i != uid_list.end(); ++i) {
+	      MonCap& cap = pool_auid_map[*i];
 	      if (op_allow) {
 		cap.allow |= cap_val;
 	      } else {