Fix clang-tidy complaints

Signed-off-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>

diff --git a/pdns/rcpgenerator.cc b/pdns/rcpgenerator.cc
index 037e614454623059e821d252183a0810c6ca8370..9351f69d49c9f6757a03818a4c96c023ca2e3878 100644 (file)
--- a/pdns/rcpgenerator.cc
+++ b/pdns/rcpgenerator.cc
@@ -58,7 +58,7 @@ void RecordTextReader::xfrNodeOrLocatorID(NodeOrLocatorID& val) {
   skipSpaces();
   size_t len;
   for(len=0;
-      d_pos+len < d_string.length() && (isxdigit(static_cast<unsigned char>(d_string.at(d_pos+len))) || d_string.at(d_pos+len) == ':');
+      d_pos+len < d_string.length() && (isxdigit(static_cast<unsigned char>(d_string.at(d_pos+len))) != 0 || d_string.at(d_pos+len) == ':');
       len++) ;   // find length of ID
 
   // Parse as v6, and then strip the final 64 zero bytes
@@ -77,9 +77,9 @@ void RecordTextReader::xfr64BitInt(uint64_t &val)
 {
   skipSpaces();
 
-  if(!isdigit(static_cast<unsigned char>(d_string.at(d_pos))))
+  if (isdigit(static_cast<unsigned char>(d_string.at(d_pos))) == 0) {
     throw RecordTextException("expected digits at position "+std::to_string(d_pos)+" in '"+d_string+"'");
-
+  }
   size_t pos;
   val=std::stoull(d_string.substr(d_pos), &pos);
 
@@ -91,9 +91,9 @@ void RecordTextReader::xfr32BitInt(uint32_t &val)
 {
   skipSpaces();
 
-  if(!isdigit(static_cast<unsigned char>(d_string.at(d_pos))))
+  if (isdigit(static_cast<unsigned char>(d_string.at(d_pos))) == 0) {
     throw RecordTextException("expected digits at position "+std::to_string(d_pos)+" in '"+d_string+"'");
-
+  }
   size_t pos;
   val = pdns::checked_stoi<uint32_t>(d_string.c_str() + d_pos, &pos);
 
@@ -141,9 +141,9 @@ void RecordTextReader::xfrIP(uint32_t &val)
 {
   skipSpaces();
 
-  if(!isdigit(static_cast<unsigned char>(d_string.at(d_pos))))
+  if (isdigit(static_cast<unsigned char>(d_string.at(d_pos))) == 0) {
     throw RecordTextException("while parsing IP address, expected digits at position "+std::to_string(d_pos)+" in '"+d_string+"'");
-
+  }
   uint32_t octet=0;
   val=0;
   char count=0;
@@ -161,7 +161,7 @@ void RecordTextReader::xfrIP(uint32_t &val)
       if(count > 3)
         throw RecordTextException(string("unable to parse IP address, too many dots"));
     }
-    else if(isdigit(static_cast<unsigned char>(d_string.at(d_pos)))) {
+    else if (isdigit(static_cast<unsigned char>(d_string.at(d_pos))) != 0) {
       last_was_digit = true;
       octet*=10;
       octet+=d_string.at(d_pos) - '0';
@@ -196,7 +196,7 @@ void RecordTextReader::xfrIP6(std::string &val)
   size_t len;
   // lookup end of value - think of ::ffff encoding too, has dots in it!
   for(len=0;
-      d_pos+len < d_string.length() && (isxdigit(static_cast<unsigned char>(d_string.at(d_pos+len))) || d_string.at(d_pos+len) == ':' || d_string.at(d_pos+len)=='.');
+      d_pos+len < d_string.length() && (isxdigit(static_cast<unsigned char>(d_string.at(d_pos+len))) != 0 || d_string.at(d_pos+len) == ':' || d_string.at(d_pos+len)=='.');
     len++);
 
   if(!len)

diff --git a/pdns/zoneparser-tng.cc b/pdns/zoneparser-tng.cc
index ad1605a126381591270ccd524db90a4fa3e6d9bb..5167c786368532959f7803afc77cc20619644070 100644 (file)
--- a/pdns/zoneparser-tng.cc
+++ b/pdns/zoneparser-tng.cc
@@ -143,7 +143,7 @@ unsigned int ZoneParserTNG::makeTTLFromZone(const string& str)
   }
 
   char lc=dns_tolower(str[str.length()-1]);
-  if(!isdigit(static_cast<unsigned char>(lc)))
+  if (isdigit(static_cast<unsigned char>(lc)) == 0) {
     switch(lc) {
     case 's':
       break;
@@ -166,6 +166,7 @@ unsigned int ZoneParserTNG::makeTTLFromZone(const string& str)
     default:
       throw PDNSException("Unable to parse time specification '"+str+"' "+getLineOfFile());
     }
+  }
   return val;
 }