From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Mon, 20 Aug 2012 14:37:50 +0000 (+0200)
Subject: Moved url.cc-related prototypes to URL.h
X-Git-Tag: sourceformat-review-1~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1bd952a158fd542fc93ac2e5c1dd9d8d16fa249;p=thirdparty%2Fsquid.git

Moved url.cc-related prototypes to URL.h
---

diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc
index 5d656606aa..f8fc40211f 100644
--- a/src/HttpRequest.cc
+++ b/src/HttpRequest.cc
@@ -48,6 +48,7 @@
 #include "MemBuf.h"
 #include "protos.h"
 #include "Store.h"
+#include "URL.h"
 
 #if USE_AUTH
 #include "auth/UserRequest.h"
diff --git a/src/Server.cc b/src/Server.cc
index 77f584437c..43a95ec9ed 100644
--- a/src/Server.cc
+++ b/src/Server.cc
@@ -48,6 +48,7 @@
 #include "StatCounters.h"
 #include "Store.h"
 #include "tools.h"
+#include "URL.h"
 
 #if USE_ADAPTATION
 #include "adaptation/AccessCheck.h"
diff --git a/src/URL.h b/src/URL.h
index e6e112fffc..ab95fc84f7 100644
--- a/src/URL.h
+++ b/src/URL.h
@@ -33,6 +33,7 @@
 #ifndef SQUID_SRC_URL_H
 #define SQUID_SRC_URL_H
 
+#include "anyp/ProtocolType.h"
 #include "MemPool.h"
 #include "URLScheme.h"
 
@@ -77,4 +78,24 @@ private:
 
 MEMPROXY_CLASS_INLINE(URL);
 
+class HttpRequest;
+class HttpRequestMethod;
+
+
+extern AnyP::ProtocolType urlParseProtocol(const char *, const char *e = NULL);
+extern void urlInitialize(void);
+extern HttpRequest *urlParse(const HttpRequestMethod&, char *, HttpRequest *request = NULL);
+extern const char *urlCanonical(HttpRequest *);
+extern char *urlCanonicalClean(const HttpRequest *);
+extern const char *urlCanonicalFakeHttps(const HttpRequest * request);
+extern bool urlIsRelative(const char *);
+extern char *urlMakeAbsolute(const HttpRequest *, const char *);
+extern char *urlRInternal(const char *host, unsigned short port, const char *dir, const char *name);
+extern char *urlInternal(const char *dir, const char *name);
+extern int matchDomainName(const char *host, const char *domain);
+extern int urlCheckRequest(const HttpRequest *);
+extern int urlDefaultPort(AnyP::ProtocolType p);
+extern char *urlHostname(const char *url);
+extern void urlExtMethodConfigure(void);
+
 #endif /* SQUID_SRC_URL_H_H */
diff --git a/src/acl/DomainData.cc b/src/acl/DomainData.cc
index 385d2142c8..f187b6cc9c 100644
--- a/src/acl/DomainData.cc
+++ b/src/acl/DomainData.cc
@@ -40,6 +40,7 @@
 #include "Debug.h"
 #include "protos.h"
 #include "wordlist.h"
+#include "URL.h"
 
 template<class T>
 inline void
diff --git a/src/acl/Url.cc b/src/acl/Url.cc
index 9457c43c85..7d02415546 100644
--- a/src/acl/Url.cc
+++ b/src/acl/Url.cc
@@ -40,6 +40,7 @@
 #include "acl/RegexData.h"
 #include "protos.h"
 #include "rfc1738.h"
+#include "URL.h"
 
 int
 ACLUrlStrategy::match (ACLData<char const *> * &data, ACLFilledChecklist *checklist)
diff --git a/src/adaptation/ecap/MessageRep.cc b/src/adaptation/ecap/MessageRep.cc
index 302da800ea..6ee19b894c 100644
--- a/src/adaptation/ecap/MessageRep.cc
+++ b/src/adaptation/ecap/MessageRep.cc
@@ -13,6 +13,7 @@
 #include "adaptation/ecap/XactionRep.h"
 #include "adaptation/ecap/Host.h" /* for protocol constants */
 #include "base/TextException.h"
+#include "URL.h"
 
 /* HeaderRep */
 
diff --git a/src/adaptation/icap/ModXact.cc b/src/adaptation/icap/ModXact.cc
index 49caee611b..8656661b35 100644
--- a/src/adaptation/icap/ModXact.cc
+++ b/src/adaptation/icap/ModXact.cc
@@ -25,6 +25,7 @@
 #include "HttpRequest.h"
 #include "protos.h"
 #include "SquidTime.h"
+#include "URL.h"
 
 // flow and terminology:
 //     HTTP| --> receive --> encode --> write --> |network
diff --git a/src/carp.cc b/src/carp.cc
index 53424235c3..a53a94e472 100644
--- a/src/carp.cc
+++ b/src/carp.cc
@@ -40,6 +40,7 @@
 #include "neighbors.h"
 #include "protos.h"
 #include "Store.h"
+#include "URL.h"
 #include "URLScheme.h"
 
 #if HAVE_MATH_H
diff --git a/src/client_side.cc b/src/client_side.cc
index e0cf5b262f..5dd22e08b0 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -123,6 +123,7 @@
 #include "Store.h"
 #include "TimeOrTag.h"
 #include "tools.h"
+#include "URL.h"
 
 #if USE_AUTH
 #include "auth/UserRequest.h"
diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc
index 772e7f3093..68faaae426 100644
--- a/src/client_side_reply.cc
+++ b/src/client_side_reply.cc
@@ -57,6 +57,7 @@
 #include "Store.h"
 #include "StoreClient.h"
 #include "tools.h"
+#include "URL.h"
 #if USE_AUTH
 #include "auth/UserRequest.h"
 #endif
diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index beea2b2ccf..b80142a503 100644
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -69,6 +69,7 @@
 #include "protos.h"
 #include "SquidTime.h"
 #include "Store.h"
+#include "URL.h"
 #include "wordlist.h"
 #if USE_AUTH
 #include "auth/UserRequest.h"
diff --git a/src/errorpage.cc b/src/errorpage.cc
index c9c7f7a5fd..d140568b2f 100644
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@ -45,7 +45,9 @@
 #include "MemBuf.h"
 #include "protos.h"
 #include "rfc1738.h"
+#include "URL.h"
 #include "URLScheme.h"
+#include "URL.h"
 #include "tools.h"
 #include "wordlist.h"
 #if USE_AUTH
diff --git a/src/external_acl.cc b/src/external_acl.cc
index 0959830eff..fa746b8564 100644
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -60,6 +60,7 @@
 #include "Store.h"
 #include "URLScheme.h"
 #include "tools.h"
+#include "URL.h"
 #include "wordlist.h"
 #if USE_SSL
 #include "ssl/support.h"
diff --git a/src/format/Format.cc b/src/format/Format.cc
index abe8e5749f..0454821e45 100644
--- a/src/format/Format.cc
+++ b/src/format/Format.cc
@@ -15,6 +15,7 @@
 #include "rfc1738.h"
 #include "SquidTime.h"
 #include "Store.h"
+#include "URL.h"
 #if USE_SSL
 #include "ssl/ErrorDetail.h"
 #endif
diff --git a/src/ftp.cc b/src/ftp.cc
index f5cea25178..4efd2727be 100644
--- a/src/ftp.cc
+++ b/src/ftp.cc
@@ -58,6 +58,7 @@
 #include "StatCounters.h"
 #include "Store.h"
 #include "tools.h"
+#include "URL.h"
 #include "URLScheme.h"
 #include "wordlist.h"
 
diff --git a/src/htcp.cc b/src/htcp.cc
index 88de49e8c2..9775216773 100644
--- a/src/htcp.cc
+++ b/src/htcp.cc
@@ -56,6 +56,7 @@
 #include "StatCounters.h"
 #include "Store.h"
 #include "StoreClient.h"
+#include "URL.h"
 
 typedef struct _Countstr Countstr;
 
diff --git a/src/http.cc b/src/http.cc
index 1802b429ed..c3974b2205 100644
--- a/src/http.cc
+++ b/src/http.cc
@@ -68,6 +68,7 @@
 #include "StatCounters.h"
 #include "Store.h"
 #include "tools.h"
+#include "URL.h"
 
 #if USE_AUTH
 #include "auth/UserRequest.h"
diff --git a/src/icmp/net_db.cc b/src/icmp/net_db.cc
index 8f956ec517..a9da15067c 100644
--- a/src/icmp/net_db.cc
+++ b/src/icmp/net_db.cc
@@ -57,7 +57,7 @@
 #include "wordlist.h"
 #include "ip/Address.h"
 #include "neighbors.h"
-
+#include "URL.h"
 
 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/src/internal.cc b/src/internal.cc
index 7812fb5b0e..a054b89c90 100644
--- a/src/internal.cc
+++ b/src/internal.cc
@@ -45,6 +45,7 @@
 #include "protos.h"
 #include "SquidTime.h"
 #include "tools.h"
+#include "URL.h"
 #include "wordlist.h"
 
 /* called when we "miss" on an internal object;
diff --git a/src/main.cc b/src/main.cc
index fb0fb1691a..ebb80621c2 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -81,6 +81,7 @@
 #include "StoreFileSystem.h"
 #include "Store.h"
 #include "SwapDir.h"
+#include "URL.h"
 #include "wccp.h"
 #include "wccp2.h"
 
diff --git a/src/neighbors.cc b/src/neighbors.cc
index 7a27933301..0522537c4b 100644
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -54,6 +54,7 @@
 #include "SquidMath.h"
 #include "SquidTime.h"
 #include "Store.h"
+#include "URL.h"
 
 /* count mcast group peers every 15 minutes */
 #define MCAST_COUNT_RATE 900
diff --git a/src/protos.h b/src/protos.h
index dda745e537..08f4682ada 100644
--- a/src/protos.h
+++ b/src/protos.h
@@ -421,21 +421,6 @@ SQUIDCEXTERN void unlinkdClose(void);
 SQUIDCEXTERN void unlinkdUnlink(const char *);
 #endif
 
-SQUIDCEXTERN AnyP::ProtocolType urlParseProtocol(const char *, const char *e = NULL);
-SQUIDCEXTERN void urlInitialize(void);
-SQUIDCEXTERN HttpRequest *urlParse(const HttpRequestMethod&, char *, HttpRequest *request = NULL);
-SQUIDCEXTERN const char *urlCanonical(HttpRequest *);
-SQUIDCEXTERN char *urlCanonicalClean(const HttpRequest *);
-SQUIDCEXTERN const char *urlCanonicalFakeHttps(const HttpRequest * request);
-SQUIDCEXTERN bool urlIsRelative(const char *);
-SQUIDCEXTERN char *urlMakeAbsolute(const HttpRequest *, const char *);
-SQUIDCEXTERN char *urlRInternal(const char *host, unsigned short port, const char *dir, const char *name);
-SQUIDCEXTERN char *urlInternal(const char *dir, const char *name);
-SQUIDCEXTERN int matchDomainName(const char *host, const char *domain);
-SQUIDCEXTERN int urlCheckRequest(const HttpRequest *);
-SQUIDCEXTERN int urlDefaultPort(AnyP::ProtocolType p);
-SQUIDCEXTERN char *urlHostname(const char *url);
-SQUIDCEXTERN void urlExtMethodConfigure(void);
 
 SQUIDCEXTERN peer_t parseNeighborType(const char *s);
 
diff --git a/src/refresh.cc b/src/refresh.cc
index 09d2362710..6a6340be1f 100644
--- a/src/refresh.cc
+++ b/src/refresh.cc
@@ -46,6 +46,7 @@
 #include "protos.h"
 #include "SquidTime.h"
 #include "Store.h"
+#include "URL.h"
 
 typedef enum {
     rcHTTP,
diff --git a/src/ssl/ServerBump.cc b/src/ssl/ServerBump.cc
index 13de802110..d63e789fe0 100644
--- a/src/ssl/ServerBump.cc
+++ b/src/ssl/ServerBump.cc
@@ -12,7 +12,7 @@
 #include "protos.h"
 #include "ssl/ServerBump.h"
 #include "Store.h"
-
+#include "URL.h"
 
 CBDATA_NAMESPACED_CLASS_INIT(Ssl, ServerBump);
 
diff --git a/src/ssl/support.cc b/src/ssl/support.cc
index 3e4244021e..f4a482a280 100644
--- a/src/ssl/support.cc
+++ b/src/ssl/support.cc
@@ -47,6 +47,7 @@
 #include "ssl/ErrorDetail.h"
 #include "ssl/support.h"
 #include "ssl/gadgets.h"
+#include "URL.h"
 
 #if HAVE_ERRNO_H
 #include <errno.h>
diff --git a/src/store_key_md5.cc b/src/store_key_md5.cc
index 8ebb91fad8..8e08520f32 100644
--- a/src/store_key_md5.cc
+++ b/src/store_key_md5.cc
@@ -37,6 +37,7 @@
 #include "HttpRequest.h"
 #include "md5.h"
 #include "protos.h"
+#include "URL.h"
 
 static cache_key null_key[SQUID_MD5_DIGEST_LENGTH];
 
diff --git a/src/urn.cc b/src/urn.cc
index e72cd09932..c340583e5f 100644
--- a/src/urn.cc
+++ b/src/urn.cc
@@ -45,6 +45,7 @@
 #include "SquidTime.h"
 #include "icmp/net_db.h"
 #include "protos.h"
+#include "URL.h"
 
 #define	URN_REQBUF_SZ	4096