From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Sat, 12 Apr 2014 07:10:39 +0000 (+0200)
Subject: Interim. Remove useless wordlist.h and SBufList.h includes, more SBufList conversions
X-Git-Tag: SQUID_3_5_0_1~295^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b859d6f6217cd95f114d184facebc4015b0ea19;p=thirdparty%2Fsquid.git

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 90b32ed867..ec81fbf52a 100644
--- 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 6184f6bd28..0867cb99b2 100644
--- 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 1a00eae65d..3aa47bca03 100644
--- 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 c4276801a2..ce6d057297 100644
--- 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 48cf8416d4..9a33d44d5d 100644
--- 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 5f70d98e39..0fdfa0dbd6 100644
--- 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 213cf16a3a..af98c4e7a9 100644
--- 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 3872f7f9bd..828117d29b 100644
--- 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 1d8cfd5f88..457d93d3b4 100644
--- 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 ecbb5fce17..32a32f46fc 100644
--- 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 541b3cce87..72fc9d8b9c 100644
--- 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 4e0275e606..ca877d535c 100644
--- 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 ea68fc464b..871a1da080 100644
--- 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 1faf726ad6..8b43e13eb2 100644
--- 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 30c4eb5049..73d9d2aad1 100644
--- 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 3d0eb52d55..beab82120b 100644
--- 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 3b4e294657..629e371014 100644
--- 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 2b4a4083f3..1bfa6f2517 100644
--- 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 cb8b032207..e58ab7b78d 100644
--- 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 c6ef8f37fd..b65a98b8ef 100644
--- 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 dcfe1bcf4a..53744255c5 100644
--- 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 beb6ea609e..858a664f9a 100644
--- 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 4c0ce97770..e3f9aff0c8 100644
--- 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 55d5fe10d1..4375ed82ed 100644
--- 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 5cc90da7c4..e3d26e0bc5 100644
--- 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 9e674dcf0d..897b00cd5f 100644
--- 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 58ae3fd22e..049044005a 100644
--- 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;}