marked several dump functions as const

diff --git a/src/acl/Asn.cc b/src/acl/Asn.cc
index ce6d057297be44b84d3d060c40e22f7fde55fe56..fad7d5e727230561b4ea7f4add6655c1b87c3ba6 100644 (file)
--- a/src/acl/Asn.cc
+++ b/src/acl/Asn.cc
@@ -551,7 +551,7 @@ ACLASN::match(Ip::Address toMatch)
 }
 
 SBufList
-ACLASN::dump()
+ACLASN::dump() const
 {
     SBufList sl;
 

diff --git a/src/acl/Asn.h b/src/acl/Asn.h
index 9a33d44d5d1154381bf52d55c81b76668fe13869..3df27eb9d05412e29a18960d7904e22fc4ba334f 100644 (file)
--- a/src/acl/Asn.h
+++ b/src/acl/Asn.h
@@ -56,7 +56,7 @@ public:
     virtual ~ACLASN();
 
     virtual bool match(Ip::Address);
-    virtual SBufList dump();
+    virtual SBufList dump() const;
     virtual void parse();
     bool empty() const;
     virtual ACLData<Ip::Address> *clone() const;

diff --git a/src/acl/Data.h b/src/acl/Data.h
index a099323793cbf4de09b1761b7d9f746026e3f2b6..64d937598fca9d4f1c941462a6fdfce616f71c03 100644 (file)
--- a/src/acl/Data.h
+++ b/src/acl/Data.h
@@ -44,7 +44,7 @@ public:
     virtual ~ACLData() {}
 
     virtual bool match(M) =0;
-    virtual SBufList dump() =0;
+    virtual SBufList dump() const =0;
     virtual void parse() =0;
     virtual ACLData *clone() const =0;
     virtual void prepareForUse() {}

diff --git a/src/acl/DomainData.cc b/src/acl/DomainData.cc
index af98c4e7a90166bee7da51acad694bc63aa7284c..e65576c05c5e59002b785bca8a6222e98a4ae8d8 100644 (file)
--- a/src/acl/DomainData.cc
+++ b/src/acl/DomainData.cc
@@ -144,7 +144,7 @@ aclDumpDomainListWalkee(char * const & node_data, void *outlist)
 }
 
 SBufList
-ACLDomainData::dump()
+ACLDomainData::dump() const
 {
     SBufList sl;
     /* damn this is VERY inefficient for long ACL lists... filling

diff --git a/src/acl/DomainData.h b/src/acl/DomainData.h
index a8981e14cf30ef55b0d134a7a065b4f9a367620d..abc98467df3539912c8e39b70fd89b891d1a1282 100644 (file)
--- a/src/acl/DomainData.h
+++ b/src/acl/DomainData.h
@@ -46,7 +46,7 @@ public:
 
     virtual ~ACLDomainData();
     bool match(char const *);
-    SBufList dump();
+    SBufList dump() const;
     void parse();
     bool empty() const;
     virtual ACLData<char const *> *clone() const;

diff --git a/src/acl/HierCodeData.cc b/src/acl/HierCodeData.cc
index 14f79579247b964e5b24cb6f6af667f24de18b07..1fb78d8a2dde69fbc8c9f46e419fcb73acac2132 100644 (file)
--- a/src/acl/HierCodeData.cc
+++ b/src/acl/HierCodeData.cc
@@ -25,7 +25,7 @@ ACLHierCodeData::match(hier_code toFind)
 }
 
 SBufList
-ACLHierCodeData::dump()
+ACLHierCodeData::dump() const
 {
     SBufList sl;
 

diff --git a/src/acl/HierCodeData.h b/src/acl/HierCodeData.h
index d29ec3e84142fcc3550d28c913f4c391ac3808d1..a5d97f8734830855c17fc884178113068b5cc5b4 100644 (file)
--- a/src/acl/HierCodeData.h
+++ b/src/acl/HierCodeData.h
@@ -18,7 +18,7 @@ public:
     ACLHierCodeData &operator= (ACLHierCodeData const &);
     virtual ~ACLHierCodeData();
     bool match(hier_code);
-    SBufList dump();
+    SBufList dump() const;
     void parse();
     bool empty() const;
     virtual ACLData<hier_code> *clone() const;

diff --git a/src/acl/HttpHeaderData.cc b/src/acl/HttpHeaderData.cc
index 32a32f46fc815ae0c890fbab2758fff6e58314b3..ed94a4d75c9edbf58946d911a9ea6fda3b853299 100644 (file)
--- a/src/acl/HttpHeaderData.cc
+++ b/src/acl/HttpHeaderData.cc
@@ -80,7 +80,7 @@ ACLHTTPHeaderData::match(HttpHeader* hdr)
 }
 
 SBufList
-ACLHTTPHeaderData::dump()
+ACLHTTPHeaderData::dump() const
 {
     SBufList sl;
     sl.push_back(SBuf(hdrName));

diff --git a/src/acl/HttpHeaderData.h b/src/acl/HttpHeaderData.h
index ea05d0e7bc7ac482785ce8b5542dd89d376fd180..0ddf4980d2beb2b93ee21b415123a547164df898 100644 (file)
--- a/src/acl/HttpHeaderData.h
+++ b/src/acl/HttpHeaderData.h
@@ -54,7 +54,7 @@ public:
     ACLHTTPHeaderData();
     virtual ~ACLHTTPHeaderData();
     virtual bool match(HttpHeader* hdr);
-    virtual SBufList dump();
+    virtual SBufList dump() const;
     virtual void parse();
     virtual bool empty() const;
     virtual ACLData<HttpHeader*> *clone() const;

diff --git a/src/acl/IntRange.cc b/src/acl/IntRange.cc
index 30d5ee39f49bf7a72cee13db48d6db2c334083d7..8020e277f3d37a4d081fc694f4c2ecd31034889f 100644 (file)
--- a/src/acl/IntRange.cc
+++ b/src/acl/IntRange.cc
@@ -112,7 +112,7 @@ ACLIntRange::~ACLIntRange()
 {}
 
 SBufList
-ACLIntRange::dump()
+ACLIntRange::dump() const
 {
     SBufList sl;
     CbDataListIterator<RangeType> iter(ranges);

diff --git a/src/acl/IntRange.h b/src/acl/IntRange.h
index 8b43e13eb2c5aaf05f48456fe05a768709083434..b4621f99f17dc601c35ea756f99014a99f5b459a 100644 (file)
--- a/src/acl/IntRange.h
+++ b/src/acl/IntRange.h
@@ -46,7 +46,7 @@ public:
 
     virtual ~ACLIntRange();
     virtual bool match(int);
-    virtual SBufList dump();
+    virtual SBufList dump() const;
     virtual void parse();
     virtual bool empty() const;
     virtual ACLData<int> *clone() const;

diff --git a/src/acl/MethodData.cc b/src/acl/MethodData.cc
index 629e37101474f779e2579cca316f0d22107e3c1f..e1cd9b6bee090d693e8ec5e1e34d19c408306935 100644 (file)
--- a/src/acl/MethodData.cc
+++ b/src/acl/MethodData.cc
@@ -68,7 +68,7 @@ template cbdata_type CbDataList<HttpRequestMethod>::CBDATA_CbDataList;
 /// \endcond
 
 SBufList
-ACLMethodData::dump()
+ACLMethodData::dump() const
 {
     SBufList sl;
     CbDataList<HttpRequestMethod> *data = values;

diff --git a/src/acl/MethodData.h b/src/acl/MethodData.h
index 1bfa6f2517e59bc4253b3351f3d076cda1b13c57..30a1604df8cfe1dd9aebeced9699376dfa691763 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);
-    SBufList dump();
+    SBufList dump() const;
     void parse();
     bool empty() const;
     virtual ACLData<HttpRequestMethod> *clone() const;

diff --git a/src/acl/NoteData.cc b/src/acl/NoteData.cc
index e58ab7b78d68a4b6f180669bee03d645e59d41e6..5c15244218a2f8e24db6b477db0e0250bf2ca720 100644 (file)
--- a/src/acl/NoteData.cc
+++ b/src/acl/NoteData.cc
@@ -52,7 +52,7 @@ ACLNoteData::match(HttpRequest *request)
 }
 
 SBufList
-ACLNoteData::dump()
+ACLNoteData::dump() const
 {
     SBufList sl;
     sl.push_back(SBuf(name));

diff --git a/src/acl/NoteData.h b/src/acl/NoteData.h
index b65a98b8ef790ca8d351941cfcfffbac91d55a90..b7e4f5d54d7a558e7b06896f0a36036dd166b3ea 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 SBufList dump();
+    virtual SBufList dump() const;
     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 53744255c533467e2bb6ba21146eb5da7a353c93..7608d9a744ead72cb423ce18a44f2769106d1967 100644 (file)
--- a/src/acl/ProtocolData.cc
+++ b/src/acl/ProtocolData.cc
@@ -66,7 +66,7 @@ template cbdata_type CbDataList<AnyP::ProtocolType>::CBDATA_CbDataList;
 /// \endcond
 
 SBufList
-ACLProtocolData::dump()
+ACLProtocolData::dump() const
 {
     SBufList sl;
     CbDataList<AnyP::ProtocolType> *data = values;

diff --git a/src/acl/ProtocolData.h b/src/acl/ProtocolData.h
index 858a664f9ab17d1bdd283029d91f264879c61faa..f7819c7f4b06ec326c99140e7f06a66f718da4fe 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);
-    SBufList dump();
+    SBufList dump() const;
     void parse();
     bool empty() const;
     virtual ACLData<AnyP::ProtocolType> *clone() const;

diff --git a/src/acl/RegexData.cc b/src/acl/RegexData.cc
index 96b31a01620e848269ac2f3cd603c84a5c3713e8..6f9b09c5637cf5b026ae7b30845280c470bc5ed1 100644 (file)
--- a/src/acl/RegexData.cc
+++ b/src/acl/RegexData.cc
@@ -102,7 +102,7 @@ ACLRegexData::match(char const *word)
 }
 
 SBufList
-ACLRegexData::dump()
+ACLRegexData::dump() const
 {
     SBufList sl;
     RegexList *temp = data;

diff --git a/src/acl/RegexData.h b/src/acl/RegexData.h
index e3d26e0bc526da5c40a265069184abce67f4ccc9..909d17cf6f51b2474c0cbf8ec9c5935265d8a11c 100644 (file)
--- a/src/acl/RegexData.h
+++ b/src/acl/RegexData.h
@@ -45,7 +45,7 @@ public:
 
     virtual ~ACLRegexData();
     virtual bool match(char const *user);
-    virtual SBufList dump();
+    virtual SBufList dump() const;
     virtual void parse();
     virtual bool empty() const;
     virtual ACLData<char const *> *clone() const;

diff --git a/src/acl/StringData.cc b/src/acl/StringData.cc
index 25bd55b2285b9c9042482357eea9f663e0c71c0f..98afd05f9a41516d7a01c366e9fe6a65bbe0a445 100644 (file)
--- a/src/acl/StringData.cc
+++ b/src/acl/StringData.cc
@@ -94,7 +94,7 @@ aclDumpStringWalkee(char * const & node_data, void *outlist)
 }
 
 SBufList
-ACLStringData::dump()
+ACLStringData::dump() const
 {
     SBufList sl;
     /* damn this is VERY inefficient for long ACL lists... filling

diff --git a/src/acl/StringData.h b/src/acl/StringData.h
index a637a6dc67ed7f5765f00d43baefcdb9ce143450..a23c942a0b62f921a248886d01b54d62ebc138de 100644 (file)
--- a/src/acl/StringData.h
+++ b/src/acl/StringData.h
@@ -48,7 +48,7 @@ public:
     ACLStringData &operator= (ACLStringData const &);
     virtual ~ACLStringData();
     bool match(char const *);
-    SBufList dump();
+    SBufList dump() const;
     virtual void parse();
     bool empty() const;
     virtual ACLData<char const *> *clone() const;

diff --git a/src/acl/TimeData.cc b/src/acl/TimeData.cc
index 98fb423d27070a2cda102bd35359b1aa9fa0ade1..39251ed67c497f84c22dbf969a8088b2130c7e29 100644 (file)
--- a/src/acl/TimeData.cc
+++ b/src/acl/TimeData.cc
@@ -98,10 +98,10 @@ ACLTimeData::match(time_t when)
 }
 
 SBufList
-ACLTimeData::dump()
+ACLTimeData::dump() const
 {
     SBufList sl;
-    ACLTimeData *t = this;
+    const ACLTimeData *t = this;
 
     while (t != NULL) {
         SBuf s;

diff --git a/src/acl/TimeData.h b/src/acl/TimeData.h
index 74b5f03f53f2eb03bf8860834cd8e5901825eaba..c7c5337521266d67e8c17e26d8e33aa61d31d845 100644 (file)
--- a/src/acl/TimeData.h
+++ b/src/acl/TimeData.h
@@ -48,7 +48,7 @@ public:
     ACLTimeData&operator=(ACLTimeData const &);
     virtual ~ACLTimeData();
     bool match(time_t);
-    SBufList dump();
+    SBufList dump() const;
     void parse();
     bool empty() const;
     virtual ACLData<time_t> *clone() const;

diff --git a/src/acl/UserData.cc b/src/acl/UserData.cc
index 62b8cb08cea04110d1599bd8979add51f051508a..cd868cca361bd5b7f9eb6fff16c98b38305a9f3c 100644 (file)
--- a/src/acl/UserData.cc
+++ b/src/acl/UserData.cc
@@ -101,7 +101,7 @@ aclDumpUserListWalkee(char * const & node_data, void *outlist)
 }
 
 SBufList
-ACLUserData::dump()
+ACLUserData::dump() const
 {
     SBufList sl;
 

diff --git a/src/acl/UserData.h b/src/acl/UserData.h
index 4c32c228e2c2e20b53af230159979370c3fb507f..30453bc0da26d18b81c9d85d44727b6c39b36a77 100644 (file)
--- a/src/acl/UserData.h
+++ b/src/acl/UserData.h
@@ -45,7 +45,7 @@ public:
 
     virtual ~ACLUserData();
     bool match(char const *user);
-    SBufList dump();
+    SBufList dump() const;
     void parse();
     bool empty() const;
     virtual ACLData<char const *> *clone() const;

diff --git a/src/tests/stub_external_acl.cc b/src/tests/stub_external_acl.cc
index af33a853c8383fefb627f1802005fd6cf454c6bc..c6c3527c51384a488e115c559f304a43e786f460 100644 (file)
--- a/src/tests/stub_external_acl.cc
+++ b/src/tests/stub_external_acl.cc
@@ -13,7 +13,7 @@ void ACLExternal::parse() STUB
 bool ACLExternal::valid () const STUB_RETVAL(false)
 bool ACLExternal::empty () const STUB_RETVAL(false)
 int ACLExternal::match(ACLChecklist *) STUB_RETVAL(0)
-wordlist * ACLExternal::dump() const STUB_RETVAL(NULL)
+SBufList ACLExternal::dump() const STUB_RETVAL(SBufList())
 void ACLExternal::ExternalAclLookup(ACLChecklist *, ACLExternal *) STUB
 void ExternalACLLookup::Start(ACLChecklist *, external_acl_data *, bool) STUB
 void externalAclInit(void) STUB_NOP

diff --git a/src/tests/stub_libauth_acls.cc b/src/tests/stub_libauth_acls.cc
index cf58fa69ad995fc9482067419622a18ba692c7b2..91c6cd5398c8e6c46eaa04e447c93c008ec0695e 100644 (file)
--- a/src/tests/stub_libauth_acls.cc
+++ b/src/tests/stub_libauth_acls.cc
@@ -20,7 +20,7 @@ bool ACLMaxUserIP::valid () const STUB_RETVAL(false)
 void ACLMaxUserIP::parse() STUB
 int ACLMaxUserIP::match(Auth::UserRequest::Pointer, Ip::Address const &) STUB_RETVAL(0)
 int ACLMaxUserIP::match(ACLChecklist *) STUB_RETVAL(0)
-wordlist * ACLMaxUserIP::dump() const STUB_RETVAL(NULL)
+SBufList ACLMaxUserIP::dump() const STUB_RETVAL(SBufList())
 
 #include "auth/AclProxyAuth.h"
 ACLProxyAuth::~ACLProxyAuth() STUB
@@ -30,7 +30,7 @@ ACLProxyAuth & ACLProxyAuth::operator= (ACLProxyAuth const & a) STUB_RETVAL(cons
 char const * ACLProxyAuth::typeString() const STUB_RETVAL(NULL)
 void ACLProxyAuth::parse() STUB
 int ACLProxyAuth::match(ACLChecklist *) STUB_RETVAL(0)
-wordlist * ACLProxyAuth::dump() const STUB_RETVAL(NULL)
+SBufList ACLProxyAuth::dump() const STUB_RETVAL(SBufList())
 bool ACLProxyAuth::empty () const STUB_RETVAL(false)
 bool ACLProxyAuth::valid () const STUB_RETVAL(false)
 ProxyAuthLookup * ProxyAuthLookup::Instance() STUB_RETVAL(NULL)