From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Tue, 27 Mar 2018 12:21:52 +0000 (+0200)
Subject: Use pre-increment instead of post-increment for non-primitive types
X-Git-Tag: dnsdist-1.3.0~7^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b5da564b0e95906b0eb4c62fe7845c35861ed77;p=pdns

Use pre-increment instead of post-increment for non-primitive types
---

diff --git a/pdns/misc.hh b/pdns/misc.hh
index df35e855d..bdc535b3a 100644
--- a/pdns/misc.hh
+++ b/pdns/misc.hh
@@ -378,7 +378,7 @@ struct CIStringComparePOSIX
       while(a!=lhs.end()) {
           if (b==rhs.end() || std::tolower(*b,loc)<std::tolower(*a,loc)) return false;
           else if (std::tolower(*a,loc)<std::tolower(*b,loc)) return true;
-          a++;b++;
+          ++a;++b;
       }
       return (b!=rhs.end());
    }
@@ -479,18 +479,18 @@ public:
  
   bool match(string::const_iterator mi, string::const_iterator mend, string::const_iterator vi, string::const_iterator vend)
   {
-    for(;;mi++) {
+    for(;;++mi) {
       if (mi == mend) {
         return vi == vend;
       } else if (*mi == '?') {
         if (vi == vend) return false;
-        vi++;
+        ++vi;
       } else if (*mi == '*') {
-        while(*mi == '*') mi++;
+        while(*mi == '*') ++mi;
         if (mi == d_mask.end()) return true;
         while(vi != vend) {
           if (match(mi,mend,vi,vend)) return true;
-          vi++;
+          ++vi;
         }
         return false;
       } else {
@@ -501,7 +501,7 @@ public:
         } else {
           if (*mi != *vi) return false;
         }
-        vi++;
+        ++vi;
       }
     }
   }
diff --git a/pdns/pollmplexer.cc b/pdns/pollmplexer.cc
index e155072a7..312c4bfec 100644
--- a/pdns/pollmplexer.cc
+++ b/pdns/pollmplexer.cc
@@ -74,7 +74,7 @@ void PollFDMultiplexer::addFD(callbackmap_t& cbmap, int fd, callbackfunc_t toDo,
 void PollFDMultiplexer::removeFD(callbackmap_t& cbmap, int fd)
 {
   if(d_inrun && d_iter->first==fd)  // trying to remove us!
-    d_iter++;
+    ++d_iter;
 
   if(!cbmap.erase(fd))
     throw FDMultiplexerException("Tried to remove unlisted fd "+std::to_string(fd)+ " from multiplexer");
diff --git a/pdns/statnode.cc b/pdns/statnode.cc
index 2d40f582a..1557bbbd6 100644
--- a/pdns/statnode.cc
+++ b/pdns/statnode.cc
@@ -112,7 +112,7 @@ void StatNode::submit(std::vector<string>::const_iterator end, std::vector<strin
       labelsCount = count;
     }
     //    cerr<<"Not yet end, set our fullname to '"<<fullname<<"', recursing"<<endl;
-    end--;
+    --end;
     children[*end].submit(end, begin, fullname, rcode, remote, count+1);
   }
 }