Moved some string-related prototypes to SquidString.h

diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc
index 5368ab699a773aedeaaceaf4ff578a9ba1908b78..08eafa3ea865f923599d3bd7673bb7a4222305e5 100644 (file)
--- a/src/HttpHeader.cc
+++ b/src/HttpHeader.cc
@@ -46,6 +46,7 @@
 #include "StatHist.h"
 #include "Store.h"
 #include "StrList.h"
+#include "SquidString.h"
 #include "TimeOrTag.h"
 
 /*

diff --git a/src/SquidString.h b/src/SquidString.h
index 4bfda6355ff4d94e740e414be821ad5c46f7c604..b0afd6e04cc2d0233d322ec3283cefe7368828c8 100644 (file)
--- a/src/SquidString.h
+++ b/src/SquidString.h
@@ -186,5 +186,7 @@ _SQUID_INLINE_ bool operator<(const String &a, const String &b);
 #endif
 
 extern const char *checkNullString(const char *p);
+extern int stringHasWhitespace(const char *); //String.cc
+extern int stringHasCntl(const char *); //String.cc
 
 #endif /* SQUID_STRING_H */

diff --git a/src/protos.h b/src/protos.h
index bae1a3674d078e3544b1c5b07aad70c46d9fb0b7..41df8909e5787f14298cf178592ae2468a0ebb1e 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -88,9 +88,6 @@ extern void reconfigure(int);
 
 #include "fatal.h"
 
-
-SQUIDCEXTERN int stringHasWhitespace(const char *); //String.cc
-SQUIDCEXTERN int stringHasCntl(const char *); //String.cc
 SQUIDCEXTERN void linklistPush(link_list **, void *); //list.cc
 SQUIDCEXTERN void *linklistShift(link_list **); //list.cc
 SQUIDCEXTERN int xrename(const char *from, const char *to); //disk.cc

diff --git a/src/url.cc b/src/url.cc
index a715bb1821e15d9013b15ac6df1d17bc18ba6cdf..607c1af7bbcebf3312b3489efeab872537e40f4e 100644 (file)
--- a/src/url.cc
+++ b/src/url.cc
@@ -38,6 +38,7 @@
 #include "HttpRequest.h"
 #include "protos.h"
 #include "rfc1738.h"
+#include "SquidString.h"
 #include "URL.h"
 #include "URLScheme.h"