From: Sage Weil <sage@redhat.com>
Date: Fri, 13 Jul 2018 16:42:28 +0000 (-0500)
Subject: monmaptool: clean up iterator use a bit
X-Git-Tag: v14.1.0~484^2~92
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a8cd2f71040da04c5bde565e4f57f54fcec14b6d;p=ceph-ci.git

monmaptool: clean up iterator use a bit

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

diff --git a/src/tools/monmaptool.cc b/src/tools/monmaptool.cc
index 79d3c16e141..4181d108c77 100644
--- a/src/tools/monmaptool.cc
+++ b/src/tools/monmaptool.cc
@@ -360,13 +360,13 @@ int main(int argc, const char **argv)
     }
     monmap.add(p->first, p->second);
   }
-  for (list<string>::iterator p = rm.begin(); p != rm.end(); ++p) {
-    cout << me << ": removing " << *p << std::endl;
-    if (!monmap.contains(*p)) {
-      cerr << me << ": map does not contain " << *p << std::endl;
+  for (auto& p : rm) {
+    cout << me << ": removing " << p << std::endl;
+    if (!monmap.contains(p)) {
+      cerr << me << ": map does not contain " << p << std::endl;
       usage();
     }
-    monmap.remove(*p);
+    monmap.remove(p);
   }
 
   if (handle_features(features, monmap)) {