Interim. Remove useless wordlist.h and SBufList.h includes, more SBufList conversions

diff --git a/src/acl/AdaptationServiceData.cc b/src/acl/AdaptationServiceData.cc
index 90b32ed8675eee00d64b80f20d7823fbde00b67e..ec81fbf52a33279779077394c09da12c4d659705 100644 (file)
--- a/src/acl/AdaptationServiceData.cc
+++ b/src/acl/AdaptationServiceData.cc
@@ -9,7 +9,6 @@
 #include "cache_cf.h"
 #include "ConfigParser.h"
 #include "Debug.h"
-#include "wordlist.h"
 
 void
 ACLAdaptationServiceData::parse()

diff --git a/src/acl/Arp.cc b/src/acl/Arp.cc
index 6184f6bd2808d9c415d7956a3cb8ab60803df3d1..0867cb99b220e96ed90ace9d748e16e055525b39 100644 (file)
--- a/src/acl/Arp.cc
+++ b/src/acl/Arp.cc
@@ -41,8 +41,8 @@
 #include "cache_cf.h"
 #include "Debug.h"
 #include "eui/Eui48.h"
+#include "globals.h"
 #include "ip/Address.h"
-#include "wordlist.h"
 
 static void aclParseArpList(SplayNode<Eui::Eui48 *> **curlist);
 static int aclMatchArp(SplayNode<Eui::Eui48 *> **dataptr, Ip::Address &c);
@@ -203,15 +203,15 @@ aclDumpArpListWalkee(Eui::Eui48 * const &node, void *state)
 {
     static char buf[48];
     node->encode(buf, 48);
-    wordlistAdd((wordlist **)state, buf);
+    static_cast<SBufList *>(state)->push_back(SBuf(buf));
 }
 
-wordlist *
+SBufList
 ACLARP::dump() const
 {
-    wordlist *w = NULL;
-    data->walk(aclDumpArpListWalkee, &w);
-    return w;
+    SBufList sl;
+    data->walk(aclDumpArpListWalkee, &sl);
+    return sl;
 }
 
 /* ==== END ARP ACL SUPPORT =============================================== */

diff --git a/src/acl/Arp.h b/src/acl/Arp.h
index 1a00eae65d6bdf2684e1b216b54e34b0215f22ba..3aa47bca030e9df0dc739ad1ac12520d3818ad4e 100644 (file)
--- a/src/acl/Arp.h
+++ b/src/acl/Arp.h
@@ -58,7 +58,7 @@ public:
     virtual char const *typeString() const;
     virtual void parse();
     virtual int match(ACLChecklist *checklist);
-    virtual wordlist *dump() const;
+    virtual SBufList dump() const;
     virtual bool empty () const;
 
 protected:

diff --git a/src/acl/Asn.cc b/src/acl/Asn.cc
index c4276801a2df03fa2e12ac37bc48190f4f090cd0..ce6d057297be44b84d3d060c40e22f7fde55fe56 100644 (file)
--- a/src/acl/Asn.cc
+++ b/src/acl/Asn.cc
@@ -50,7 +50,6 @@
 #include "Store.h"
 #include "StoreClient.h"
 #include "StoreClient.h"
-#include "wordlist.h"
 
 #define WHOIS_PORT 43
 #define        AS_REQBUF_SZ    4096

diff --git a/src/acl/Asn.h b/src/acl/Asn.h
index 48cf8416d408a69dc8cec9258a99fcbe61b54f68..9a33d44d5d1154381bf52d55c81b76668fe13869 100644 (file)
--- a/src/acl/Asn.h
+++ b/src/acl/Asn.h
@@ -37,7 +37,6 @@
 #include "acl/Strategised.h"
 #include "CbDataList.h"
 #include "ip/Address.h"
-#include "SBufList.h"
 
 int asnMatchIp(CbDataList<int> *, Ip::Address &);
 

diff --git a/src/acl/BoolOps.cc b/src/acl/BoolOps.cc
index 5f70d98e399cf8368762b1410d5bb7be2d171755..0fdfa0dbd60a6403f3f191b71f3a47009b1ffa43 100644 (file)
--- a/src/acl/BoolOps.cc
+++ b/src/acl/BoolOps.cc
@@ -2,7 +2,6 @@
 #include "acl/BoolOps.h"
 #include "acl/Checklist.h"
 #include "Debug.h"
-#include "wordlist.h"
 
 /* Acl::NotNode */
 

diff --git a/src/acl/DomainData.cc b/src/acl/DomainData.cc
index 213cf16a3ae64efe066a04cbea6df3a5b1c54b1e..af98c4e7a90166bee7da51acad694bc63aa7284c 100644 (file)
--- a/src/acl/DomainData.cc
+++ b/src/acl/DomainData.cc
@@ -38,7 +38,6 @@
 #include "cache_cf.h"
 #include "Debug.h"
 #include "src/URL.h"
-#include "wordlist.h"
 
 template<class T>
 inline void

diff --git a/src/acl/Eui64.cc b/src/acl/Eui64.cc
index 3872f7f9bda01c64e2db8fc701462438bb719452..828117d29b54059888a2b20a190208626914d5a1 100644 (file)
--- a/src/acl/Eui64.cc
+++ b/src/acl/Eui64.cc
@@ -41,8 +41,8 @@
 #include "cache_cf.h"
 #include "Debug.h"
 #include "eui/Eui64.h"
+#include "globals.h"
 #include "ip/Address.h"
-#include "wordlist.h"
 
 static void aclParseEuiList(SplayNode<Eui::Eui64 *> **curlist);
 static int aclMatchEui(SplayNode<Eui::Eui64 *> **dataptr, Ip::Address &c);
@@ -177,13 +177,13 @@ aclDumpEuiListWalkee(Eui::Eui64 * const &node, void *state)
 {
     static char buf[48];
     node->encode(buf, 48);
-    wordlistAdd((wordlist **)state, buf);
+    static_cast<SBufList *>(state)->push_back(SBuf(buf));
 }
 
-wordlist *
+SBufList
 ACLEui64::dump() const
 {
-    wordlist *w = NULL;
+    SBufList w;
     data->walk(aclDumpEuiListWalkee, &w);
     return w;
 }

diff --git a/src/acl/Eui64.h b/src/acl/Eui64.h
index 1d8cfd5f88fc2b7e9fec8dcf2b2d9568a8f7667f..457d93d3b4ec97f6014f9f911de935bb2a092ed1 100644 (file)
--- a/src/acl/Eui64.h
+++ b/src/acl/Eui64.h
@@ -57,7 +57,7 @@ public:
     virtual char const *typeString() const;
     virtual void parse();
     virtual int match(ACLChecklist *checklist);
-    virtual wordlist *dump() const;
+    virtual SBufList dump() const;
     virtual bool empty () const;
 
 protected:

diff --git a/src/acl/HttpHeaderData.cc b/src/acl/HttpHeaderData.cc
index ecbb5fce17d15ead5b7c2d727afed019a2f12d40..32a32f46fc815ae0c890fbab2758fff6e58314b3 100644 (file)
--- a/src/acl/HttpHeaderData.cc
+++ b/src/acl/HttpHeaderData.cc
@@ -42,7 +42,6 @@
 #include "Debug.h"
 #include "HttpHeaderTools.h"
 #include "SBuf.h"
-#include "wordlist.h"
 
 /* Construct an ACLHTTPHeaderData that uses an ACLRegex rule with the value of the
  * selected header from a given request.

diff --git a/src/acl/HttpStatus.cc b/src/acl/HttpStatus.cc
index 541b3cce8732b4c90768cbe70ba5691c1c07ee6a..72fc9d8b9c332faff37e83ec635605d9752ad4ac 100644 (file)
--- a/src/acl/HttpStatus.cc
+++ b/src/acl/HttpStatus.cc
@@ -38,7 +38,6 @@
 #include "cache_cf.h"
 #include "Debug.h"
 #include "HttpReply.h"
-#include "wordlist.h"
 
 #include <climits>
 

diff --git a/src/acl/InnerNode.cc b/src/acl/InnerNode.cc
index 4e0275e606f66c8d117c398c70a481f7c8a3ecec..ca877d535c60c208243a9e7ce36c26453d897227 100644 (file)
--- a/src/acl/InnerNode.cc
+++ b/src/acl/InnerNode.cc
@@ -7,7 +7,6 @@
 #include "ConfigParser.h"
 #include "Debug.h"
 #include "globals.h"
-#include "wordlist.h"
 #include <algorithm>
 
 void

diff --git a/src/acl/IntRange.cc b/src/acl/IntRange.cc
index ea68fc464b1f1c15b694dc32429c8ebb7d39d347..871a1da0807e1f7818c8d7efa5d6f1c6e6748bdf 100644 (file)
--- a/src/acl/IntRange.cc
+++ b/src/acl/IntRange.cc
@@ -37,7 +37,6 @@
 #include "cache_cf.h"
 #include "Debug.h"
 #include "Parsing.h"
-#include "wordlist.h"
 
 /* explicit instantiation required for some systems */
 /** \cond AUTODOCS_IGNORE */

diff --git a/src/acl/IntRange.h b/src/acl/IntRange.h
index 1faf726ad62c7b03106f3035068f62be4b6a031a..8b43e13eb2c5aaf05f48456fe05a768709083434 100644 (file)
--- a/src/acl/IntRange.h
+++ b/src/acl/IntRange.h
@@ -36,7 +36,6 @@
 #include "acl/Data.h"
 #include "CbDataList.h"
 #include "Range.h"
-#include "SBufList.h"
 
 /// \ingroup ACLAPI
 class ACLIntRange : public ACLData<int>

diff --git a/src/acl/MaxConnection.cc b/src/acl/MaxConnection.cc
index 30c4eb5049d1d0af11ef16d1ffc1d5c8ee5ea2a1..73d9d2aad13fbb5ffc0cf4305fa196fef4ddf223 100644 (file)
--- a/src/acl/MaxConnection.cc
+++ b/src/acl/MaxConnection.cc
@@ -39,7 +39,6 @@
 #include "client_db.h"
 #include "Debug.h"
 #include "SquidConfig.h"
-#include "wordlist.h"
 
 ACL *
 ACLMaxConnection::clone() const
@@ -104,21 +103,17 @@ ACLMaxConnection::match(ACLChecklist *checklist)
     return clientdbEstablished(Filled(checklist)->src_addr, 0) > limit ? 1 : 0;
 }
 
-wordlist *
+SBufList
 ACLMaxConnection::dump() const
 {
+    SBufList sl;
     if (!limit)
-        return NULL;
+        return sl;
 
-    wordlist *W = NULL;
-
-    char buf[32];
-
-    snprintf(buf, sizeof(buf), "%d", limit);
-
-    wordlistAdd(&W, buf);
-
-    return W;
+    SBuf s;
+    s.Printf("%d", limit);
+    sl.push_back(s);
+    return sl;
 }
 
 void

diff --git a/src/acl/MaxConnection.h b/src/acl/MaxConnection.h
index 3d0eb52d551c84df77853a9aadada67458e6d7b8..beab82120b0d87b7a1bb72097b5e77f908d06a3d 100644 (file)
--- a/src/acl/MaxConnection.h
+++ b/src/acl/MaxConnection.h
@@ -52,7 +52,7 @@ public:
     virtual char const *typeString() const;
     virtual void parse();
     virtual int match(ACLChecklist *checklist);
-    virtual wordlist *dump() const;
+    virtual SBufList dump() const;
     virtual bool empty () const;
     virtual bool valid () const;
     virtual void prepareForUse();

diff --git a/src/acl/MethodData.cc b/src/acl/MethodData.cc
index 3b4e294657f4c03e71a6ceb7ceb7278765b92ec6..629e37101474f779e2579cca316f0d22107e3c1f 100644 (file)
--- a/src/acl/MethodData.cc
+++ b/src/acl/MethodData.cc
@@ -37,7 +37,6 @@
 #include "acl/MethodData.h"
 #include "cache_cf.h"
 #include "HttpRequestMethod.h"
-#include "wordlist.h"
 
 int ACLMethodData::ThePurgeCount = 0;
 
@@ -68,18 +67,18 @@ ACLMethodData::match(HttpRequestMethod toFind)
 template cbdata_type CbDataList<HttpRequestMethod>::CBDATA_CbDataList;
 /// \endcond
 
-wordlist *
+SBufList
 ACLMethodData::dump()
 {
-    wordlist *W = NULL;
+    SBufList sl;
     CbDataList<HttpRequestMethod> *data = values;
 
     while (data != NULL) {
-        wordlistAdd(&W, RequestMethodStr(data->element));
+        sl.push_back(SBuf(RequestMethodStr(data->element)));
         data = data->next;
     }
 
-    return W;
+    return sl;
 }
 
 void

diff --git a/src/acl/MethodData.h b/src/acl/MethodData.h
index 2b4a4083f31acd3e126342683dc8ba6333a15d42..1bfa6f2517e59bc4253b3351f3d076cda1b13c57 100644 (file)
--- a/src/acl/MethodData.h
+++ b/src/acl/MethodData.h
@@ -50,7 +50,7 @@ public:
     ACLMethodData &operator= (ACLMethodData const &);
     virtual ~ACLMethodData();
     bool match(HttpRequestMethod);
-    wordlist *dump();
+    SBufList dump();
     void parse();
     bool empty() const;
     virtual ACLData<HttpRequestMethod> *clone() const;

diff --git a/src/acl/NoteData.cc b/src/acl/NoteData.cc
index cb8b0322078b523807947341522465f8be805ee3..e58ab7b78d68a4b6f180669bee03d645e59d41e6 100644 (file)
--- a/src/acl/NoteData.cc
+++ b/src/acl/NoteData.cc
@@ -51,15 +51,13 @@ ACLNoteData::match(HttpRequest *request)
     return false;
 }
 
-wordlist *
+SBufList
 ACLNoteData::dump()
 {
-    wordlist *W = NULL;
-    wordlistAdd(&W, name.termedBuf());
-    wordlist * dumpR = values->dump();
-    wordlistAddWl(&W, dumpR);
-    wordlistDestroy(&dumpR);
-    return W;
+    SBufList sl;
+    sl.push_back(SBuf(name));
+    sl.splice(sl.end(),values->dump());
+    return sl;
 }
 
 void

diff --git a/src/acl/NoteData.h b/src/acl/NoteData.h
index c6ef8f37fd7ac8760b77f8a6eceb28af4dcad4ef..b65a98b8ef790ca8d351941cfcfffbac91d55a90 100644 (file)
--- a/src/acl/NoteData.h
+++ b/src/acl/NoteData.h
@@ -17,7 +17,7 @@ public:
     ACLNoteData();
     virtual ~ACLNoteData();
     virtual bool match(HttpRequest* request);
-    virtual wordlist *dump();
+    virtual SBufList dump();
     virtual void parse();
     virtual bool empty() const;
     virtual ACLData<HttpRequest *> *clone() const;

diff --git a/src/acl/ProtocolData.cc b/src/acl/ProtocolData.cc
index dcfe1bcf4a5baf45f5a71d9fab41c03946c57f77..53744255c533467e2bb6ba21146eb5da7a353c93 100644 (file)
--- a/src/acl/ProtocolData.cc
+++ b/src/acl/ProtocolData.cc
@@ -65,18 +65,18 @@ ACLProtocolData::match(AnyP::ProtocolType toFind)
 template cbdata_type CbDataList<AnyP::ProtocolType>::CBDATA_CbDataList;
 /// \endcond
 
-wordlist *
+SBufList
 ACLProtocolData::dump()
 {
-    wordlist *W = NULL;
+    SBufList sl;
     CbDataList<AnyP::ProtocolType> *data = values;
 
     while (data != NULL) {
-        wordlistAdd(&W, AnyP::ProtocolType_str[data->element]);
+        sl.push_back(SBuf(AnyP::ProtocolType_str[data->element]));
         data = data->next;
     }
 
-    return W;
+    return sl;
 }
 
 void

diff --git a/src/acl/ProtocolData.h b/src/acl/ProtocolData.h
index beb6ea609e89b15600828ac145909f0c32a47005..858a664f9ab17d1bdd283029d91f264879c61faa 100644 (file)
--- a/src/acl/ProtocolData.h
+++ b/src/acl/ProtocolData.h
@@ -50,7 +50,7 @@ public:
     ACLProtocolData &operator= (ACLProtocolData const &);
     virtual ~ACLProtocolData();
     bool match(AnyP::ProtocolType);
-    wordlist *dump();
+    SBufList dump();
     void parse();
     bool empty() const;
     virtual ACLData<AnyP::ProtocolType> *clone() const;

diff --git a/src/acl/Random.cc b/src/acl/Random.cc
index 4c0ce97770b5c1d34d353e0103078648b2b64bcd..e3f9aff0c895baee11b6a10839fdbea7540650de 100644 (file)
--- a/src/acl/Random.cc
+++ b/src/acl/Random.cc
@@ -135,10 +135,10 @@ ACLRandom::match(ACLChecklist *cl)
     return (data > random)?1:0;
 }
 
-wordlist *
+SBufList
 ACLRandom::dump() const
 {
-    wordlist *w = NULL;
-    wordlistAdd(&w, pattern);
-    return w;
+    SBufList sl;
+    sl.push_back(SBuf(pattern));
+    return sl;
 }

diff --git a/src/acl/Random.h b/src/acl/Random.h
index 55d5fe10d1eeb3bfda0582bf4feddcdb85dfeb51..4375ed82ed24ab3b8fc920a03e4279ac272a292a 100644 (file)
--- a/src/acl/Random.h
+++ b/src/acl/Random.h
@@ -51,7 +51,7 @@ public:
     virtual char const *typeString() const;
     virtual void parse();
     virtual int match(ACLChecklist *checklist);
-    virtual wordlist *dump() const;
+    virtual SBufList dump() const;
     virtual bool empty () const;
     virtual bool valid() const;
 

diff --git a/src/acl/RegexData.h b/src/acl/RegexData.h
index 5cc90da7c483d4571bd6856996bad0f9cdd1698d..e3d26e0bc526da5c40a265069184abce67f4ccc9 100644 (file)
--- a/src/acl/RegexData.h
+++ b/src/acl/RegexData.h
@@ -34,7 +34,6 @@
 
 #include "acl/Data.h"
 #include "MemPool.h"
-#include "SBufList.h"
 
 class RegexList;
 

diff --git a/src/auth/AclMaxUserIp.cc b/src/auth/AclMaxUserIp.cc
index 9e674dcf0dc299a6f42d7e6d98b3685af1ecfc60..897b00cd5f984dd06d3648a6510095385c90b63c 100644 (file)
--- a/src/auth/AclMaxUserIp.cc
+++ b/src/auth/AclMaxUserIp.cc
@@ -146,19 +146,14 @@ ACLMaxUserIP::match(ACLChecklist *cl)
     }
 }
 
-wordlist *
+SBufList
 ACLMaxUserIP::dump() const
 {
+    SBufList sl;
     if (!maximum)
-        return NULL;
-
-    wordlist *W = NULL;
-
-    char buf[128];
-
-    snprintf(buf, sizeof(buf), "%lu", (unsigned long int) maximum);
-
-    wordlistAdd(&W, buf);
-
-    return W;
+        return sl;
+    SBuf s;
+    s.Printf("%lu", (unsigned long int) maximum);
+    sl.push_back(s);
+    return sl;
 }

diff --git a/src/auth/AclMaxUserIp.h b/src/auth/AclMaxUserIp.h
index 58ae3fd22e1e359e20fa2b42cb2459172283f3fa..049044005abeac62113c32485a8b17868c56098d 100644 (file)
--- a/src/auth/AclMaxUserIp.h
+++ b/src/auth/AclMaxUserIp.h
@@ -54,7 +54,7 @@ public:
     virtual char const *typeString() const;
     virtual void parse();
     virtual int match(ACLChecklist *cl);
-    virtual wordlist *dump() const;
+    virtual SBufList dump() const;
     virtual bool empty() const;
     virtual bool valid() const;
     virtual bool requiresRequest() const {return true;}