From cb6655e720393559b8f526d0865177f20455b3d2 Mon Sep 17 00:00:00 2001
From: Charles-Henri Bruyand <charles-henri.bruyand@open-xchange.com>
Date: Tue, 27 Mar 2018 17:49:52 +0200
Subject: [PATCH] rec: prefer prefix ++/-- operators for non-primitive types

---
 pdns/arguments.cc             | 6 +++---
 pdns/recursordist/negcache.cc | 4 ++--
 pdns/resolver.cc              | 4 ++--
 pdns/zoneparser-tng.cc        | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pdns/arguments.cc b/pdns/arguments.cc
index 5e62d41706..2696ac3c8d 100644
--- a/pdns/arguments.cc
+++ b/pdns/arguments.cc
@@ -100,7 +100,7 @@ bool ArgvMap::contains(const string &var, const string &val)
   vector<string>::const_iterator i;
   
   stringtok( parts, param->second, ", \t" );
-  for( i = parts.begin(); i != parts.end(); i++ ) {
+  for( i = parts.begin(); i != parts.end(); ++i ) {
     if( *i == val ) {
       return true;
     }
@@ -118,7 +118,7 @@ string ArgvMap::helpstring(string prefix)
   
   for(map<string,string>::const_iterator i=helpmap.begin();
       i!=helpmap.end();
-      i++)
+      ++i)
     {
       if(!prefix.empty() && i->first.find(prefix) != 0) // only print items with prefix
         continue;
@@ -154,7 +154,7 @@ string ArgvMap::configstring(bool current)
   else
     help="# Autogenerated configuration file template\n";
   
-  for(map<string,string>::const_iterator i=helpmap.begin(); i!=helpmap.end(); i++) {
+  for(map<string,string>::const_iterator i=helpmap.begin(); i!=helpmap.end(); ++i) {
     if(d_typeMap[i->first]=="Command")
       continue;
 
diff --git a/pdns/recursordist/negcache.cc b/pdns/recursordist/negcache.cc
index 573ee1e081..7b9d33645a 100644
--- a/pdns/recursordist/negcache.cc
+++ b/pdns/recursordist/negcache.cc
@@ -56,7 +56,7 @@ bool NegCache::getRootNXTrust(const DNSName& qname, const struct timeval& now, N
       return true;
     }
     moveCacheItemToFront(d_negcache, ni);
-    ni++;
+    ++ni;
   }
   return false;
 }
@@ -87,7 +87,7 @@ bool NegCache::get(const DNSName& qname, const QType& qtype, const struct timeva
       // expired
       moveCacheItemToFront(d_negcache, ni);
     }
-    ni++;
+    ++ni;
   }
   return false;
 }
diff --git a/pdns/resolver.cc b/pdns/resolver.cc
index b839f1fd99..82b1df6785 100644
--- a/pdns/resolver.cc
+++ b/pdns/resolver.cc
@@ -115,7 +115,7 @@ Resolver::Resolver()
 
 Resolver::~Resolver()
 {
-  for(std::map<std::string,int>::iterator iter = locals.begin(); iter != locals.end(); iter++) {
+  for(std::map<std::string,int>::iterator iter = locals.begin(); iter != locals.end(); ++iter) {
     if (iter->second >= 0)
       close(iter->second);
   }
@@ -222,7 +222,7 @@ bool Resolver::tryGetSOASerial(DNSName *domain, ComboAddress* remote, uint32_t *
   size_t i = 0, k;
   int sock;
 
-  for(std::map<string,int>::iterator iter=locals.begin(); iter != locals.end(); iter++, i++) {
+  for(std::map<string,int>::iterator iter=locals.begin(); iter != locals.end(); ++iter, ++i) {
     fds[i].fd = iter->second;
     fds[i].events = POLLIN;
   }
diff --git a/pdns/zoneparser-tng.cc b/pdns/zoneparser-tng.cc
index 58ee2e4fca..2c38e912d2 100644
--- a/pdns/zoneparser-tng.cc
+++ b/pdns/zoneparser-tng.cc
@@ -523,7 +523,7 @@ bool ZoneParserTNG::getLine()
   if (d_zonedata.size() > 0) {
     if (d_zonedataline != d_zonedata.end()) {
       d_line = *d_zonedataline;
-      d_zonedataline++;
+      ++d_zonedataline;
       return true;
     }
     return false;
-- 
2.47.2