From 3d93a84d71a5df9a61b20cdbab607e88688bfdb8 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Sat, 20 Mar 2010 14:53:34 +1300 Subject: [PATCH] SourceLayout: Shuffle TextException into libbase --- src/BodyPipe.cc | 2 +- src/ChunkedCodingParser.cc | 2 +- src/LoadableModule.cc | 2 +- src/Makefile.am | 7 +++---- src/Server.cc | 2 +- src/String.cc | 2 +- src/adaptation/AccessCheck.cc | 2 +- src/adaptation/History.cc | 8 ++++---- src/adaptation/Iterator.cc | 8 ++++---- src/adaptation/Message.cc | 4 ++-- src/adaptation/ecap/Host.cc | 2 +- src/adaptation/ecap/MessageRep.cc | 2 +- src/adaptation/ecap/ServiceRep.cc | 2 +- src/adaptation/ecap/XactionRep.cc | 2 +- src/adaptation/icap/Launcher.cc | 8 ++++---- src/adaptation/icap/ModXact.cc | 24 ++++++++++++------------ src/adaptation/icap/OptXact.cc | 2 +- src/adaptation/icap/Options.cc | 8 ++++---- src/adaptation/icap/ServiceRep.cc | 10 +++++----- src/adaptation/icap/Xaction.cc | 2 +- src/base/AsyncJob.cc | 6 +++--- src/base/AsyncJob.h | 1 - src/base/Makefile.am | 4 +++- src/{ => base}/TextException.cc | 6 ++++-- src/{ => base}/TextException.h | 2 +- src/http.cc | 2 +- src/main.cc | 2 +- 27 files changed, 63 insertions(+), 61 deletions(-) rename src/{ => base}/TextException.cc (94%) rename src/{ => base}/TextException.h (98%) diff --git a/src/BodyPipe.cc b/src/BodyPipe.cc index eb0a7e52d4..57732ac088 100644 --- a/src/BodyPipe.cc +++ b/src/BodyPipe.cc @@ -1,7 +1,7 @@ #include "squid.h" +#include "base/TextException.h" #include "BodyPipe.h" -#include "TextException.h" CBDATA_CLASS_INIT(BodyPipe); diff --git a/src/ChunkedCodingParser.cc b/src/ChunkedCodingParser.cc index 1c17263577..bbbf891387 100644 --- a/src/ChunkedCodingParser.cc +++ b/src/ChunkedCodingParser.cc @@ -1,6 +1,6 @@ #include "squid.h" +#include "base/TextException.h" #include "Parsing.h" -#include "TextException.h" #include "ChunkedCodingParser.h" #include "MemBuf.h" diff --git a/src/LoadableModule.cc b/src/LoadableModule.cc index faf96c5411..df01bc7b59 100644 --- a/src/LoadableModule.cc +++ b/src/LoadableModule.cc @@ -12,7 +12,7 @@ #include #endif -#include "TextException.h" +#include "base/TextException.h" #include "LoadableModule.h" // Note: We must use preprocessor instead of C ifs because if dlopen() diff --git a/src/Makefile.am b/src/Makefile.am index f682bd0296..d0e7c1c7e5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -249,9 +249,7 @@ libsquid_la_SOURCES = \ CommCalls.h \ DescriptorSet.cc \ DescriptorSet.h \ - SquidConfig.cc \ - TextException.cc \ - TextException.h + SquidConfig.cc squid_SOURCES = \ $(ACL_REGISTRATION_SOURCES) \ @@ -968,9 +966,10 @@ tests_testHttpReply_LDADD=\ acl/libstate.la \ auth/libauth.la \ ip/libip.la \ + base/libbase.la \ $(SQUID_CPPUNIT_LIBS) \ $(SQUID_CPPUNIT_LA) \ - -L../lib -lmiscutil \ + $(COMPAT_LIB) \ $(XTRA_LIBS) tests_testHttpReply_DEPENDENCIES= $(SQUID_CPPUNIT_LA) \ $(top_builddir)/lib/libmiscutil.a diff --git a/src/Server.cc b/src/Server.cc index 5f00e52295..1b7c820d23 100644 --- a/src/Server.cc +++ b/src/Server.cc @@ -33,11 +33,11 @@ */ #include "squid.h" +#include "base/TextException.h" #include "Server.h" #include "Store.h" #include "HttpRequest.h" #include "HttpReply.h" -#include "TextException.h" #include "errorpage.h" #include "SquidTime.h" diff --git a/src/String.cc b/src/String.cc index 40eae2c59e..81a7c4e14f 100644 --- a/src/String.cc +++ b/src/String.cc @@ -34,8 +34,8 @@ */ #include "squid.h" +#include "base/TextException.h" #include "Store.h" -#include "TextException.h" int String::psize() const diff --git a/src/adaptation/AccessCheck.cc b/src/adaptation/AccessCheck.cc index 2f3a12617b..953c2e84a1 100644 --- a/src/adaptation/AccessCheck.cc +++ b/src/adaptation/AccessCheck.cc @@ -10,7 +10,7 @@ #include "adaptation/AccessRule.h" #include "adaptation/Config.h" #include "adaptation/AccessCheck.h" - +#include "base/TextException.h" /** \cond AUTODOCS-IGNORE */ cbdata_type Adaptation::AccessCheck::CBDATA_AccessCheck = CBDATA_UNKNOWN; diff --git a/src/adaptation/History.cc b/src/adaptation/History.cc index 4733b5aef3..3ecd4d3780 100644 --- a/src/adaptation/History.cc +++ b/src/adaptation/History.cc @@ -1,10 +1,10 @@ #include "config.h" -#include "globals.h" -#include "TextException.h" -#include "SquidTime.h" -#include "HttpRequest.h" /* for alLogformatHasAdaptToken */ #include "adaptation/Config.h" #include "adaptation/History.h" +#include "base/TextException.h" +#include "globals.h" +#include "HttpRequest.h" /* for alLogformatHasAdaptToken */ +#include "SquidTime.h" /// impossible services value to identify unset theNextServices const static char *TheNullServices = ",null,"; diff --git a/src/adaptation/Iterator.cc b/src/adaptation/Iterator.cc index 1b903faf0a..afd8e294e0 100644 --- a/src/adaptation/Iterator.cc +++ b/src/adaptation/Iterator.cc @@ -3,15 +3,15 @@ */ #include "squid.h" -#include "TextException.h" -#include "HttpRequest.h" -#include "HttpReply.h" -#include "HttpMsg.h" #include "adaptation/Config.h" #include "adaptation/Iterator.h" #include "adaptation/Service.h" #include "adaptation/ServiceFilter.h" #include "adaptation/ServiceGroups.h" +#include "base/TextException.h" +#include "HttpRequest.h" +#include "HttpReply.h" +#include "HttpMsg.h" Adaptation::Iterator::Iterator(Adaptation::Initiator *anInitiator, diff --git a/src/adaptation/Message.cc b/src/adaptation/Message.cc index ee4bac6500..fb525d1bb9 100644 --- a/src/adaptation/Message.cc +++ b/src/adaptation/Message.cc @@ -3,9 +3,9 @@ */ #include "squid.h" -#include "HttpMsg.h" -#include "TextException.h" #include "adaptation/Message.h" +#include "base/TextException.h" +#include "HttpMsg.h" Adaptation::Message::Message(): header(NULL) { diff --git a/src/adaptation/ecap/Host.cc b/src/adaptation/ecap/Host.cc index 62995d2661..48f9d65f67 100644 --- a/src/adaptation/ecap/Host.cc +++ b/src/adaptation/ecap/Host.cc @@ -1,7 +1,7 @@ #include "squid.h" #include #include -#include "TextException.h" +#include "base/TextException.h" #include "adaptation/ecap/ServiceRep.h" #include "adaptation/ecap/Host.h" diff --git a/src/adaptation/ecap/MessageRep.cc b/src/adaptation/ecap/MessageRep.cc index ac50b731ee..bb56803406 100644 --- a/src/adaptation/ecap/MessageRep.cc +++ b/src/adaptation/ecap/MessageRep.cc @@ -6,13 +6,13 @@ #include "HttpRequest.h" #include "HttpReply.h" #include "BodyPipe.h" -#include "TextException.h" #include #include #include #include "adaptation/ecap/MessageRep.h" #include "adaptation/ecap/XactionRep.h" #include "adaptation/ecap/Host.h" /* for protocol constants */ +#include "base/TextException.h" /* HeaderRep */ diff --git a/src/adaptation/ecap/ServiceRep.cc b/src/adaptation/ecap/ServiceRep.cc index be8027aafd..162c4305b9 100644 --- a/src/adaptation/ecap/ServiceRep.cc +++ b/src/adaptation/ecap/ServiceRep.cc @@ -1,8 +1,8 @@ #include "squid.h" #include -#include "TextException.h" #include "adaptation/ecap/ServiceRep.h" #include "adaptation/ecap/XactionRep.h" +#include "base/TextException.h" Adaptation::Ecap::ServiceRep::ServiceRep(const Adaptation::ServiceConfig &cfg): /*AsyncJob("Adaptation::Ecap::ServiceRep"),*/ Adaptation::Service(cfg) diff --git a/src/adaptation/ecap/XactionRep.cc b/src/adaptation/ecap/XactionRep.cc index c78a1096d7..219c2889f2 100644 --- a/src/adaptation/ecap/XactionRep.cc +++ b/src/adaptation/ecap/XactionRep.cc @@ -2,11 +2,11 @@ #include #include #include -#include "TextException.h" #include "HttpRequest.h" #include "HttpReply.h" #include "SquidTime.h" #include "adaptation/ecap/XactionRep.h" +#include "base/TextException.h" CBDATA_NAMESPACED_CLASS_INIT(Adaptation::Ecap::XactionRep, XactionRep); diff --git a/src/adaptation/icap/Launcher.cc b/src/adaptation/icap/Launcher.cc index 313a8b275b..d95c3377f1 100644 --- a/src/adaptation/icap/Launcher.cc +++ b/src/adaptation/icap/Launcher.cc @@ -3,15 +3,15 @@ */ #include "squid.h" -#include "TextException.h" -#include "HttpRequest.h" -#include "HttpReply.h" #include "acl/FilledChecklist.h" -#include "HttpMsg.h" #include "adaptation/icap/Launcher.h" #include "adaptation/icap/Xaction.h" #include "adaptation/icap/ServiceRep.h" #include "adaptation/icap/Config.h" +#include "base/TextException.h" +#include "HttpMsg.h" +#include "HttpRequest.h" +#include "HttpReply.h" Adaptation::Icap::Launcher::Launcher(const char *aTypeName, diff --git a/src/adaptation/icap/ModXact.cc b/src/adaptation/icap/ModXact.cc index bddee51219..d2911d9433 100644 --- a/src/adaptation/icap/ModXact.cc +++ b/src/adaptation/icap/ModXact.cc @@ -3,23 +3,23 @@ */ #include "squid.h" +#include "AccessLogEntry.h" +#include "adaptation/History.h" +#include "adaptation/icap/Client.h" +#include "adaptation/icap/Config.h" +#include "adaptation/icap/History.h" +#include "adaptation/icap/Launcher.h" +#include "adaptation/icap/ModXact.h" +#include "adaptation/icap/ServiceRep.h" +#include "adaptation/Initiator.h" +#include "auth/UserRequest.h" +#include "base/TextException.h" +#include "ChunkedCodingParser.h" #include "comm.h" #include "HttpMsg.h" #include "HttpRequest.h" #include "HttpReply.h" -#include "adaptation/Initiator.h" -#include "adaptation/icap/ServiceRep.h" -#include "adaptation/icap/Launcher.h" -#include "adaptation/icap/ModXact.h" -#include "adaptation/icap/Client.h" -#include "ChunkedCodingParser.h" -#include "TextException.h" -#include "auth/UserRequest.h" -#include "adaptation/icap/Config.h" #include "SquidTime.h" -#include "AccessLogEntry.h" -#include "adaptation/icap/History.h" -#include "adaptation/History.h" // flow and terminology: // HTTP| --> receive --> encode --> write --> |network diff --git a/src/adaptation/icap/OptXact.cc b/src/adaptation/icap/OptXact.cc index 0eb53af1de..17990d9602 100644 --- a/src/adaptation/icap/OptXact.cc +++ b/src/adaptation/icap/OptXact.cc @@ -8,7 +8,7 @@ #include "adaptation/icap/OptXact.h" #include "adaptation/icap/Options.h" -#include "TextException.h" +#include "base/TextException.h" #include "SquidTime.h" #include "HttpRequest.h" diff --git a/src/adaptation/icap/Options.cc b/src/adaptation/icap/Options.cc index 630dcbfbc4..da84d28c62 100644 --- a/src/adaptation/icap/Options.cc +++ b/src/adaptation/icap/Options.cc @@ -1,10 +1,10 @@ #include "squid.h" -#include "wordlist.h" -#include "HttpReply.h" -#include "adaptation/icap/Options.h" -#include "TextException.h" #include "adaptation/icap/Config.h" +#include "adaptation/icap/Options.h" +#include "base/TextException.h" +#include "HttpReply.h" #include "SquidTime.h" +#include "wordlist.h" Adaptation::Icap::Options::Options(): error("unconfigured"), max_connections(-1), allow204(false), diff --git a/src/adaptation/icap/ServiceRep.cc b/src/adaptation/icap/ServiceRep.cc index c6a0740050..7e788be519 100644 --- a/src/adaptation/icap/ServiceRep.cc +++ b/src/adaptation/icap/ServiceRep.cc @@ -3,14 +3,14 @@ */ #include "squid.h" -#include "TextException.h" -#include "HttpReply.h" -#include "adaptation/icap/ServiceRep.h" +#include "adaptation/icap/Config.h" +#include "adaptation/icap/ModXact.h" #include "adaptation/icap/Options.h" #include "adaptation/icap/OptXact.h" +#include "adaptation/icap/ServiceRep.h" +#include "base/TextException.h" #include "ConfigParser.h" -#include "adaptation/icap/Config.h" -#include "adaptation/icap/ModXact.h" +#include "HttpReply.h" #include "SquidTime.h" CBDATA_NAMESPACED_CLASS_INIT(Adaptation::Icap, ServiceRep); diff --git a/src/adaptation/icap/Xaction.cc b/src/adaptation/icap/Xaction.cc index e7f4cc0749..18c11dc228 100644 --- a/src/adaptation/icap/Xaction.cc +++ b/src/adaptation/icap/Xaction.cc @@ -9,7 +9,7 @@ #include "adaptation/icap/Xaction.h" #include "adaptation/icap/Launcher.h" #include "adaptation/icap/Config.h" -#include "TextException.h" +#include "base/TextException.h" #include "pconn.h" #include "HttpRequest.h" #include "HttpReply.h" diff --git a/src/base/AsyncJob.cc b/src/base/AsyncJob.cc index 4b4fb6ad07..19559f8e78 100644 --- a/src/base/AsyncJob.cc +++ b/src/base/AsyncJob.cc @@ -3,11 +3,11 @@ */ #include "squid.h" +#include "base/AsyncCall.h" +#include "base/AsyncJob.h" +#include "base/TextException.h" #include "cbdata.h" #include "MemBuf.h" -#include "TextException.h" -#include "base/AsyncJob.h" -#include "base/AsyncCall.h" unsigned int AsyncJob::TheLastId = 0; diff --git a/src/base/AsyncJob.h b/src/base/AsyncJob.h index dd33044ca0..4a182c5818 100644 --- a/src/base/AsyncJob.h +++ b/src/base/AsyncJob.h @@ -6,7 +6,6 @@ #define SQUID_ASYNC_JOB_H #include "base/AsyncCall.h" -#include "TextException.h" /** \defgroup AsyncJobAPI Async-Jobs API diff --git a/src/base/Makefile.am b/src/base/Makefile.am index 0596e0168f..0e1d4a96da 100644 --- a/src/base/Makefile.am +++ b/src/base/Makefile.am @@ -11,4 +11,6 @@ libbase_la_SOURCES = \ AsyncJob.cc \ AsyncJobCalls.h \ AsyncCallQueue.cc \ - AsyncCallQueue.h + AsyncCallQueue.h \ + TextException.cc \ + TextException.h diff --git a/src/TextException.cc b/src/base/TextException.cc similarity index 94% rename from src/TextException.cc rename to src/base/TextException.cc index bcee994378..c595e30937 100644 --- a/src/TextException.cc +++ b/src/base/TextException.cc @@ -1,5 +1,7 @@ -#include "squid.h" -#include "TextException.h" +#include "config.h" +#include "base/TextException.h" +#include "Debug.h" +#include "util.h" TextException::TextException() { diff --git a/src/TextException.h b/src/base/TextException.h similarity index 98% rename from src/TextException.h rename to src/base/TextException.h index 59e82b42fc..c559c52e8a 100644 --- a/src/TextException.h +++ b/src/base/TextException.h @@ -3,7 +3,7 @@ // Origin: xstd/TextException -#include "squid.h" +#include "config.h" #include // simple exception to report custom errors diff --git a/src/http.cc b/src/http.cc index 36c9f2c511..e00332cb5a 100644 --- a/src/http.cc +++ b/src/http.cc @@ -42,6 +42,7 @@ #include "acl/FilledChecklist.h" #include "auth/UserRequest.h" +#include "base/TextException.h" #if DELAY_POOLS #include "DelayPools.h" #endif @@ -59,7 +60,6 @@ #include "rfc1738.h" #include "SquidTime.h" #include "Store.h" -#include "TextException.h" #define SQUID_ENTER_THROWING_CODE() try { diff --git a/src/main.cc b/src/main.cc index 85cbbba2b9..255528623c 100644 --- a/src/main.cc +++ b/src/main.cc @@ -38,6 +38,7 @@ #include "adaptation/icap/icap_log.h" #endif #include "auth/Gadgets.h" +#include "base/TextException.h" #include "ConfigParser.h" #include "errorpage.h" #include "event.h" @@ -73,7 +74,6 @@ #include "MemPool.h" #include "icmp/IcmpSquid.h" #include "icmp/net_db.h" -#include "TextException.h" #if USE_LOADABLE_MODULES #include "LoadableModules.h" -- 2.47.2