From: Francesco Chemolli Date: Wed, 22 Aug 2012 13:14:01 +0000 (+0200) Subject: moved HttpHeaderTools.cc-related headers to HttpHeaderTools.h X-Git-Tag: sourceformat-review-1~66 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5bac1d2c727c558b8af4c13d3c5a84137435596;p=thirdparty%2Fsquid.git moved HttpHeaderTools.cc-related headers to HttpHeaderTools.h --- diff --git a/src/HttpHdrCc.cc b/src/HttpHdrCc.cc index 9d5411633f..8e56264a20 100644 --- a/src/HttpHdrCc.cc +++ b/src/HttpHdrCc.cc @@ -34,6 +34,7 @@ #include "base/StringArea.h" #include "HttpHeader.h" #include "HttpHeaderStat.h" +#include "HttpHeaderTools.h" #include "HttpHdrCc.h" #include "StatHist.h" #include "Store.h" diff --git a/src/HttpHdrSc.cc b/src/HttpHdrSc.cc index eac4a02549..b9c657cb40 100644 --- a/src/HttpHdrSc.cc +++ b/src/HttpHdrSc.cc @@ -40,6 +40,7 @@ #include "HttpHdrSc.h" #include "HttpHeader.h" #include "HttpHeaderStat.h" +#include "HttpHeaderTools.h" #include "Store.h" #include "protos.h" diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc index 9a29cb7be0..f35eff3f09 100644 --- a/src/HttpHeader.cc +++ b/src/HttpHeader.cc @@ -40,6 +40,7 @@ #include "HttpHdrSc.h" #include "HttpHeader.h" #include "HttpHeaderStat.h" +#include "HttpHeaderTools.h" #include "MemBuf.h" #include "mgr/Registration.h" #include "profiler/Profiler.h" diff --git a/src/HttpHeaderTools.h b/src/HttpHeaderTools.h index a954607ce0..1da330e32b 100644 --- a/src/HttpHeaderTools.h +++ b/src/HttpHeaderTools.h @@ -3,6 +3,7 @@ #include "format/Format.h" #include "HttpHeader.h" +#include "typedefs.h" #if HAVE_LIST #include @@ -91,6 +92,19 @@ public: bool quoted; }; -SQUIDCEXTERN int httpHeaderParseOffset(const char *start, int64_t * off); +extern int httpHeaderParseOffset(const char *start, int64_t * off); + +class HttpHeaderFieldInfo; +class String; + +extern HttpHeaderFieldInfo *httpHeaderBuildFieldsInfo(const HttpHeaderFieldAttrs * attrs, int count); +extern void httpHeaderDestroyFieldsInfo(HttpHeaderFieldInfo * info, int count); +extern http_hdr_type httpHeaderIdByName(const char *name, size_t name_len, const HttpHeaderFieldInfo * attrs, int end); +extern http_hdr_type httpHeaderIdByNameDef(const char *name, int name_len); +extern const char *httpHeaderNameById(int id); +extern int httpHeaderHasConnDir(const HttpHeader * hdr, const char *directive); +extern int httpHeaderParseInt(const char *start, int *val); +extern void httpHeaderPutStrf(HttpHeader * hdr, http_hdr_type id, const char *fmt,...) PRINTF_FORMAT_ARG3; + #endif diff --git a/src/HttpMsg.cc b/src/HttpMsg.cc index 772d35f2f3..2922089ddd 100644 --- a/src/HttpMsg.cc +++ b/src/HttpMsg.cc @@ -35,6 +35,7 @@ #include "squid.h" #include "Debug.h" +#include "HttpHeaderTools.h" #include "HttpMsg.h" #include "MemBuf.h" #include "profiler/Profiler.h" diff --git a/src/Makefile.am b/src/Makefile.am index 7dd4f4f13f..9fc7b86757 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1098,6 +1098,7 @@ tests_testHttpReply_SOURCES=\ HttpHeader.h \ HttpHeader.cc \ HttpHeaderMask.h \ + HttpHeaderTools.h \ HttpHeaderTools.cc \ HttpControlMsg.h \ HttpMsg.cc \ @@ -1182,6 +1183,7 @@ tests_testACLMaxUserIP_SOURCES= \ HttpBody.cc \ HttpHeader.h \ HttpHeader.cc \ + HttpHeaderTools.h \ HttpHeaderTools.cc \ HttpHdrContRange.cc \ HttpHdrRange.cc \ @@ -1386,6 +1388,7 @@ tests_testCacheManager_SOURCES = \ HttpBody.cc \ HttpHeader.h \ HttpHeader.cc \ + HttpHeaderTools.h \ HttpHeaderTools.cc \ HttpHdrCc.h \ HttpHdrCc.cc \ @@ -1550,6 +1553,7 @@ tests_testDiskIO_SOURCES = \ HttpHdrSc.cc \ HttpHdrScTarget.cc \ HttpHdrRange.cc \ + HttpHeaderTools.h \ HttpHeaderTools.cc \ HttpHeader.h \ HttpHeader.cc \ @@ -1747,6 +1751,7 @@ tests_testEvent_SOURCES = \ HttpBody.cc \ HttpHeader.h \ HttpHeader.cc \ + HttpHeaderTools.h \ HttpHeaderTools.cc \ HttpHdrCc.h \ HttpHdrCc.cc \ @@ -1962,6 +1967,7 @@ tests_testEventLoop_SOURCES = \ HttpBody.cc \ HttpHeader.h \ HttpHeader.cc \ + HttpHeaderTools.h \ HttpHeaderTools.cc \ HttpHdrCc.h \ HttpHdrCc.cc \ @@ -2181,6 +2187,7 @@ tests_test_http_range_SOURCES = \ HttpHdrScTarget.cc \ HttpHeader.h \ HttpHeader.cc \ + HttpHeaderTools.h \ HttpHeaderTools.cc \ HttpMsg.cc \ HttpParser.cc \ @@ -2434,6 +2441,7 @@ tests_testHttpRequest_SOURCES = \ HttpBody.cc \ HttpHeader.h \ HttpHeader.cc \ + HttpHeaderTools.h \ HttpHeaderTools.cc \ HttpHdrCc.h \ HttpHdrCc.cc \ @@ -2593,6 +2601,7 @@ tests_testStore_SOURCES= \ HttpHdrRange.cc \ HttpHdrSc.cc \ HttpHdrScTarget.cc \ + HttpHeaderTools.h \ HttpHeaderTools.cc \ HttpHeader.h \ HttpHeader.cc \ @@ -2852,6 +2861,7 @@ tests_testUfs_SOURCES = \ mem_node.cc \ stmem.cc \ tests/stub_mime.cc \ + HttpHeaderTools.h \ HttpHeaderTools.cc \ HttpHeader.h \ HttpHeader.cc \ @@ -2957,6 +2967,7 @@ tests_testRock_SOURCES = \ HttpHdrScTarget.cc \ HttpHeader.h \ HttpHeader.cc \ + HttpHeaderTools.h \ HttpHeaderTools.cc \ HttpMsg.cc \ HttpReply.cc \ @@ -3143,6 +3154,7 @@ tests_testCoss_SOURCES = \ mem_node.cc \ stmem.cc \ tests/stub_mime.cc \ + HttpHeaderTools.h \ HttpHeaderTools.cc \ HttpHeader.h \ HttpHeader.cc \ @@ -3290,6 +3302,7 @@ tests_testNull_SOURCES = \ mem_node.cc \ stmem.cc \ tests/stub_mime.cc \ + HttpHeaderTools.h \ HttpHeaderTools.cc \ HttpHeader.h \ HttpHeader.cc \ @@ -3431,6 +3444,7 @@ tests_testURL_SOURCES = \ HttpHdrScTarget.cc \ HttpHeader.h \ HttpHeader.cc \ + HttpHeaderTools.h \ HttpHeaderTools.cc \ HttpMsg.cc \ HttpParser.cc \ diff --git a/src/acl/HttpHeaderData.cc b/src/acl/HttpHeaderData.cc index fcfc048c0d..43f138cc8e 100644 --- a/src/acl/HttpHeaderData.cc +++ b/src/acl/HttpHeaderData.cc @@ -43,6 +43,7 @@ #include "protos.h" #include "wordlist.h" #include "ConfigParser.h" +#include "HttpHeaderTools.h" /* Construct an ACLHTTPHeaderData that uses an ACLRegex rule with the value of the * selected header from a given request. diff --git a/src/adaptation/icap/ModXact.cc b/src/adaptation/icap/ModXact.cc index 8656661b35..e2413c4ec5 100644 --- a/src/adaptation/icap/ModXact.cc +++ b/src/adaptation/icap/ModXact.cc @@ -20,6 +20,7 @@ #include "comm.h" #include "comm/Connection.h" #include "err_detail_type.h" +#include "HttpHeaderTools.h" #include "HttpMsg.h" #include "HttpReply.h" #include "HttpRequest.h" diff --git a/src/adaptation/icap/OptXact.cc b/src/adaptation/icap/OptXact.cc index 4607d1543f..af4aa5a196 100644 --- a/src/adaptation/icap/OptXact.cc +++ b/src/adaptation/icap/OptXact.cc @@ -9,6 +9,7 @@ #include "adaptation/icap/OptXact.h" #include "base/TextException.h" #include "comm.h" +#include "HttpHeaderTools.h" #include "HttpReply.h" #include "HttpRequest.h" #include "protos.h" diff --git a/src/auth/basic/auth_basic.cc b/src/auth/basic/auth_basic.cc index d9196b573b..a303299ae8 100644 --- a/src/auth/basic/auth_basic.cc +++ b/src/auth/basic/auth_basic.cc @@ -48,6 +48,7 @@ #include "charset.h" #include "mgr/Registration.h" #include "Store.h" +#include "HttpHeaderTools.h" #include "HttpReply.h" #include "protos.h" #include "rfc1738.h" diff --git a/src/auth/digest/UserRequest.cc b/src/auth/digest/UserRequest.cc index 920c7290f0..bb37ddf749 100644 --- a/src/auth/digest/UserRequest.cc +++ b/src/auth/digest/UserRequest.cc @@ -4,6 +4,7 @@ #include "auth/digest/UserRequest.h" #include "auth/State.h" #include "charset.h" +#include "HttpHeaderTools.h" #include "HttpReply.h" #include "HttpRequest.h" #include "protos.h" diff --git a/src/auth/digest/auth_digest.cc b/src/auth/digest/auth_digest.cc index b0eb7a4cf0..721987be58 100644 --- a/src/auth/digest/auth_digest.cc +++ b/src/auth/digest/auth_digest.cc @@ -49,6 +49,7 @@ #include "base64.h" #include "base/StringArea.h" #include "event.h" +#include "HttpHeaderTools.h" #include "mgr/Registration.h" #include "Store.h" #include "HttpRequest.h" diff --git a/src/auth/negotiate/UserRequest.cc b/src/auth/negotiate/UserRequest.cc index 59c43d7c0a..e4903669fa 100644 --- a/src/auth/negotiate/UserRequest.cc +++ b/src/auth/negotiate/UserRequest.cc @@ -6,6 +6,7 @@ #include "client_side.h" #include "globals.h" #include "helper.h" +#include "HttpHeaderTools.h" #include "HttpReply.h" #include "HttpRequest.h" #include "protos.h" diff --git a/src/auth/negotiate/auth_negotiate.cc b/src/auth/negotiate/auth_negotiate.cc index 631e4aba69..be858cceee 100644 --- a/src/auth/negotiate/auth_negotiate.cc +++ b/src/auth/negotiate/auth_negotiate.cc @@ -45,6 +45,7 @@ #include "mgr/Registration.h" #include "Store.h" #include "client_side.h" +#include "HttpHeaderTools.h" #include "HttpReply.h" #include "HttpRequest.h" #include "protos.h" diff --git a/src/auth/ntlm/auth_ntlm.cc b/src/auth/ntlm/auth_ntlm.cc index dd1effe24b..3e7528ae66 100644 --- a/src/auth/ntlm/auth_ntlm.cc +++ b/src/auth/ntlm/auth_ntlm.cc @@ -48,6 +48,7 @@ #include "mgr/Registration.h" #include "Store.h" #include "client_side.h" +#include "HttpHeaderTools.h" #include "HttpReply.h" #include "HttpRequest.h" #include "protos.h" diff --git a/src/cache_cf.cc b/src/cache_cf.cc index a75f1e384c..b75377e32a 100644 --- a/src/cache_cf.cc +++ b/src/cache_cf.cc @@ -46,6 +46,7 @@ #include "ExternalACL.h" #include "format/Format.h" #include "globals.h" +#include "HttpHeaderTools.h" #include "HttpRequestMethod.h" #include "ident/Config.h" #include "ip/Intercept.h" diff --git a/src/client_side.cc b/src/client_side.cc index 1d1c614569..9686112333 100644 --- a/src/client_side.cc +++ b/src/client_side.cc @@ -107,6 +107,7 @@ #include "fqdncache.h" #include "http.h" #include "HttpHdrContRange.h" +#include "HttpHeaderTools.h" #include "HttpReply.h" #include "HttpRequest.h" #include "ident/Config.h" diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc index 9995f5feb2..856b4c5554 100644 --- a/src/client_side_reply.cc +++ b/src/client_side_reply.cc @@ -46,6 +46,7 @@ #include "forward.h" #include "globals.h" #include "globals.h" +#include "HttpHeaderTools.h" #include "HttpReply.h" #include "HttpRequest.h" #include "ip/QosConfig.h" diff --git a/src/errorpage.cc b/src/errorpage.cc index 556062a176..d5a34fd98d 100644 --- a/src/errorpage.cc +++ b/src/errorpage.cc @@ -41,6 +41,7 @@ #include "ftp.h" #include "Store.h" #include "html_quote.h" +#include "HttpHeaderTools.h" #include "HttpReply.h" #include "HttpRequest.h" #include "MemObject.h" diff --git a/src/external_acl.cc b/src/external_acl.cc index 0b4602c42c..fc56866fc0 100644 --- a/src/external_acl.cc +++ b/src/external_acl.cc @@ -50,6 +50,7 @@ #include "ExternalACL.h" #include "fde.h" #include "helper.h" +#include "HttpHeaderTools.h" #include "HttpReply.h" #include "HttpRequest.h" #include "ip/tools.h" diff --git a/src/http.cc b/src/http.cc index 6b5a547663..15768c762b 100644 --- a/src/http.cc +++ b/src/http.cc @@ -56,6 +56,7 @@ #include "HttpHdrContRange.h" #include "HttpHdrSc.h" #include "HttpHdrScTarget.h" +#include "HttpHeaderTools.h" #include "HttpReply.h" #include "HttpRequest.h" #include "log/access_log.h" diff --git a/src/protos.h b/src/protos.h index 17f0cc1dee..1f335c0bb8 100644 --- a/src/protos.h +++ b/src/protos.h @@ -58,22 +58,13 @@ class FwdState; class HttpRequest; class HttpReply; - -/* Http Header Tools */ -class HttpHeaderFieldInfo; -SQUIDCEXTERN HttpHeaderFieldInfo *httpHeaderBuildFieldsInfo(const HttpHeaderFieldAttrs * attrs, int count); -SQUIDCEXTERN void httpHeaderDestroyFieldsInfo(HttpHeaderFieldInfo * info, int count); -SQUIDCEXTERN http_hdr_type httpHeaderIdByName(const char *name, size_t name_len, const HttpHeaderFieldInfo * attrs, int end); -SQUIDCEXTERN http_hdr_type httpHeaderIdByNameDef(const char *name, int name_len); -SQUIDCEXTERN const char *httpHeaderNameById(int id); -SQUIDCEXTERN int httpHeaderHasConnDir(const HttpHeader * hdr, const char *directive); +/* TODO: move to StrList.h */ SQUIDCEXTERN void strListAdd(String * str, const char *item, char del); SQUIDCEXTERN int strListIsMember(const String * str, const char *item, char del); SQUIDCEXTERN int strListIsSubstr(const String * list, const char *s, char del); SQUIDCEXTERN int strListGetItem(const String * str, char del, const char **item, int *ilen, const char **pos); -SQUIDCEXTERN const char *getStringPrefix(const char *str, const char *end); -SQUIDCEXTERN int httpHeaderParseInt(const char *start, int *val); -SQUIDCEXTERN void httpHeaderPutStrf(HttpHeader * hdr, http_hdr_type id, const char *fmt,...) PRINTF_FORMAT_ARG3; + +extern const char *getStringPrefix(const char *str, const char *end);