dnsdist: Refactor AndRule and OrRule to modern C++ loops

diff --git a/pdns/dnsdistdist/dnsdist-rules.hh b/pdns/dnsdistdist/dnsdist-rules.hh
index d43f9dbfd6ff066f3eeb8ec2b81b778300635ed8..885101957beb8d686b6d834592322ab58a6577d1 100644 (file)
--- a/pdns/dnsdistdist/dnsdist-rules.hh
+++ b/pdns/dnsdistdist/dnsdist-rules.hh
@@ -403,11 +403,12 @@ public:
 
   bool matches(const DNSQuestion* dq) const override
   {
-    auto iter = d_rules.begin();
-    for(; iter != d_rules.end(); ++iter)
-      if(!(*iter)->matches(dq))
-        break;
-    return iter == d_rules.end();
+    for (const auto& rule : d_rules) {
+      if (!rule->matches(dq)) {
+        return false;
+      }
+    }
+    return true;
   }
 
   string toString() const override
@@ -438,10 +439,11 @@ public:
 
   bool matches(const DNSQuestion* dq) const override
   {
-    auto iter = d_rules.begin();
-    for(; iter != d_rules.end(); ++iter)
-      if((*iter)->matches(dq))
+    for (const auto& rule: d_rules) {
+      if (rule->matches(dq)) {
         return true;
+      }
+    }
     return false;
   }