Let toLowerCanonic() invoke toLowerInPlace() instead of duplicating it.

Signed-off-by: Miod Vallat <miod.vallat@powerdns.com>

diff --git a/pdns/misc.hh b/pdns/misc.hh
index 710adaa9094e3c518c7012ea46d19bfd4cea7470..eb4ee3afc30beb35a1aa3a99c586e58dffe6b8cf 100644 (file)
--- a/pdns/misc.hh
+++ b/pdns/misc.hh
@@ -307,31 +307,24 @@ inline const string toLower(const string &upper)
 inline const string toLowerCanonic(const string &upper)
 {
   string reply(upper);
-  if(!upper.empty()) {
-    unsigned int i, limit= ( unsigned int ) reply.length();
-    unsigned char c;
-    for(i = 0; i < limit ; i++) {
-      c = dns_tolower(upper[i]);
-      if(c != upper[i])
-        reply[i] = c;
+  if (!reply.empty()) {
+    const auto length = reply.length();
+    if (reply[length - 1] == '.') {
+      reply.resize(length - 1);
     }
-    if(upper[i-1]=='.')
-      reply.resize(i-1);
+    toLowerInPlace(reply);
   }
-
   return reply;
 }
 
-
-
 // Make s uppercase:
 inline string toUpper( const string& s )
 {
-        string r(s);
-        for( unsigned int i = 0; i < s.length(); i++ ) {
-          r[i] = dns_toupper(r[i]);
-        }
-        return r;
+  string r(s);
+  for (size_t i = 0; i < s.length(); ++i) {
+    r[i] = dns_toupper(r[i]);
+  }
+  return r;
 }
 
 inline double getTime()