move two other functions into ascii.hh

dns_isspace() and dns_toupper() are all functions operating upon ASCII
characters. So lets move them into ascii.hh and keep them together with
dns_tolower().

diff --git a/pdns/ascii.hh b/pdns/ascii.hh
index 69b1a393513e2a9b5dfc9078b62ca117f8e56426..09f42de6f167bfb944ac2b882aafc0f90703e9ed 100644 (file)
--- a/pdns/ascii.hh
+++ b/pdns/ascii.hh
@@ -21,6 +21,18 @@
  */
 #pragma once
 
+inline bool dns_isspace(char c)
+{
+  return c==' ' || c=='\t' || c=='\r' || c=='\n';
+}
+
+inline unsigned char dns_toupper(unsigned char c)
+{
+  if(c>='a' && c<='z')
+    c+='A'-'a';
+  return c;
+}
+
 inline unsigned char dns_tolower(unsigned char c)
 {
   if(c>='A' && c<='Z')

diff --git a/pdns/misc.hh b/pdns/misc.hh
index fe5f796fdcbad87f08260158e3ace748f86edd8f..47cfcc9dd8ca7a18fdad7ab0ecd0dca1b3c0e480 100644 (file)
--- a/pdns/misc.hh
+++ b/pdns/misc.hh
@@ -229,19 +229,6 @@ inline int DTime::udiffNoReset()
   return ret;
 }
 
-
-inline bool dns_isspace(char c)
-{
-  return c==' ' || c=='\t' || c=='\r' || c=='\n';
-}
-
-inline unsigned char dns_toupper(unsigned char c)
-{
-  if(c>='a' && c<='z')
-    c+='A'-'a';
-  return c;
-}
-
 inline const string toLower(const string &upper)
 {
   string reply(upper);

diff --git a/pdns/rcpgenerator.cc b/pdns/rcpgenerator.cc
index 1acb1d82976ec4651c6e5301a9f8d202e1a875b3..aea5c4437816553455cf18368ae7b2265c005d7d 100644 (file)
--- a/pdns/rcpgenerator.cc
+++ b/pdns/rcpgenerator.cc
@@ -23,6 +23,7 @@
 #include "config.h"
 #endif
 #include "rcpgenerator.hh"
+#include "ascii.hh"
 #include "dnsparser.hh"
 #include "misc.hh"
 #include "utility.hh"

diff --git a/pdns/zoneparser-tng.cc b/pdns/zoneparser-tng.cc
index 36777795ccdd7d5eb7066799eae015801a7fe708..153d89239ce33e265195223045215fcf17efbfa2 100644 (file)
--- a/pdns/zoneparser-tng.cc
+++ b/pdns/zoneparser-tng.cc
@@ -22,6 +22,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include "ascii.hh"
 #include "dnsparser.hh"
 #include "sstuff.hh"
 #include "misc.hh"