From: amosjeffries <>
Date: Sat, 1 Sep 2007 11:56:37 +0000 (+0000)
Subject: typedef acl_list is deprecated in Squid3 by class ACLList
X-Git-Tag: SQUID_3_0_RC1~75
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=76cd39d7c947efdd6101c22f6bdee788dd1d38d3;p=thirdparty%2Fsquid.git

typedef acl_list is deprecated in Squid3 by class ACLList
---

diff --git a/src/ACL.h b/src/ACL.h
index f9bbcae4d9..b50c1aad43 100644
--- a/src/ACL.h
+++ b/src/ACL.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ACL.h,v 1.18 2007/01/28 15:37:46 serassio Exp $
+ * $Id: ACL.h,v 1.19 2007/09/01 05:56:37 amosjeffries Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -48,9 +48,9 @@ class ConfigParser;
 /* acl.c */
 SQUIDCEXTERN void aclDestroyAccessList(acl_access **list);
 SQUIDCEXTERN void aclDestroyAcls(ACL **);
-SQUIDCEXTERN void aclDestroyAclList(acl_list **);
+SQUIDCEXTERN void aclDestroyAclList(ACLList **);
 SQUIDCEXTERN void aclParseAccessLine(ConfigParser &parser, acl_access **);
-SQUIDCEXTERN void aclParseAclList(ConfigParser &parser, acl_list **);
+SQUIDCEXTERN void aclParseAclList(ConfigParser &parser, ACLList **);
 SQUIDCEXTERN int aclIsProxyAuth(const char *name);
 SQUIDCEXTERN err_type aclGetDenyInfoPage(acl_deny_info_list ** head, const char *name, int redirect_allowed);
 
@@ -131,7 +131,7 @@ public:
     void operator delete(void *);
     bool containsPURGE() const;
     allow_t allow;
-    acl_list *aclList;
+    ACLList *aclList;
     char *cfgline;
     acl_access *next;
 
@@ -155,8 +155,6 @@ public:
 
 MEMPROXY_CLASS_INLINE(ACLList)
 
-typedef ACLList acl_list;
-
 class acl_proxy_auth_match_cache
 {
 
diff --git a/src/ACLChecklist.cc b/src/ACLChecklist.cc
index 54b2550a0a..f5d0181949 100644
--- a/src/ACLChecklist.cc
+++ b/src/ACLChecklist.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLChecklist.cc,v 1.41 2007/07/19 00:37:05 hno Exp $
+ * $Id: ACLChecklist.cc,v 1.42 2007/09/01 05:56:37 amosjeffries Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -275,16 +275,16 @@ ACLChecklist::checkCallback(allow_t answer)
 }
 
 void
-ACLChecklist::matchAclListSlow(const acl_list * list)
+ACLChecklist::matchAclListSlow(const ACLList * list)
 {
     matchAclList(list, false);
 }
 
 void
-ACLChecklist::matchAclList(const acl_list * head, bool const fast)
+ACLChecklist::matchAclList(const ACLList * head, bool const fast)
 {
     PROF_start(aclMatchAclList);
-    const acl_list *node = head;
+    const ACLList *node = head;
 
     finished_ = false;
 
diff --git a/src/ACLChecklist.cci b/src/ACLChecklist.cci
index aa253b95db..898729b005 100644
--- a/src/ACLChecklist.cci
+++ b/src/ACLChecklist.cci
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLChecklist.cci,v 1.5 2007/06/17 21:39:49 hno Exp $
+ * $Id: ACLChecklist.cci,v 1.6 2007/09/01 05:56:37 amosjeffries Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Henrik Nordstrom
@@ -33,7 +33,7 @@
  */
 
 bool
-ACLChecklist::matchAclListFast(const acl_list * list)
+ACLChecklist::matchAclListFast(const ACLList * list)
 {
     matchAclList(list, true);
     return finished();
diff --git a/src/ACLChecklist.h b/src/ACLChecklist.h
index e86df0f82f..1862bab7e8 100644
--- a/src/ACLChecklist.h
+++ b/src/ACLChecklist.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ACLChecklist.h,v 1.27 2007/07/19 00:37:05 hno Exp $
+ * $Id: ACLChecklist.h,v 1.28 2007/09/01 05:56:37 amosjeffries Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -96,7 +96,7 @@ class NullState : public AsyncState
     int fastCheck();
     void checkCallback(allow_t answer);
     void preCheck();
-    _SQUID_INLINE_ bool matchAclListFast(const acl_list * list);
+    _SQUID_INLINE_ bool matchAclListFast(const ACLList * list);
     ConnStateData::Pointer conn();
     void conn(ConnStateData::Pointer);
     int authenticated();
@@ -140,8 +140,8 @@ class NullState : public AsyncState
     void markSourceDomainChecked();
 
 private:
-    void matchAclList(const acl_list * list, bool const fast);
-    void matchAclListSlow(const acl_list * list);
+    void matchAclList(const ACLList * list, bool const fast);
+    void matchAclListSlow(const ACLList * list);
     CBDATA_CLASS(ACLChecklist);
     ConnStateData::Pointer conn_;	/* hack for ident and NTLM */
     bool async_;
diff --git a/src/acl.cc b/src/acl.cc
index 6118346ab5..4b60fe54c3 100644
--- a/src/acl.cc
+++ b/src/acl.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: acl.cc,v 1.322 2007/04/28 22:26:37 hno Exp $
+ * $Id: acl.cc,v 1.323 2007/09/01 05:56:37 amosjeffries Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -324,7 +324,7 @@ bool
 acl_access::containsPURGE() const
 {
     acl_access const *a = this;
-    acl_list *b;
+    ACLList *b;
 
     debugs(28, 6, "acl_access::containsPURGE: invoked for '" << cfgline << "'");
 
diff --git a/src/acl_noncore.cc b/src/acl_noncore.cc
index 9ae96cabd1..abd6fac91c 100644
--- a/src/acl_noncore.cc
+++ b/src/acl_noncore.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: acl_noncore.cc,v 1.5 2007/04/28 22:26:37 hno Exp $
+ * $Id: acl_noncore.cc,v 1.6 2007/09/01 05:56:37 amosjeffries Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -201,9 +201,9 @@ aclParseAccessLine(ConfigParser &parser, acl_access ** head)
 }
 
 void
-aclParseAclList(ConfigParser &parser, acl_list ** head)
+aclParseAclList(ConfigParser &parser, ACLList ** head)
 {
-    acl_list **Tail = head;	/* sane name in the use below */
+    ACLList **Tail = head;	/* sane name in the use below */
     ACL *a = NULL;
     char *t;
 
@@ -211,7 +211,7 @@ aclParseAclList(ConfigParser &parser, acl_list ** head)
      * by '!' for negation */
 
     while ((t = strtok(NULL, w_space))) {
-        acl_list *L = new ACLList;
+        ACLList *L = new ACLList;
 
         if (*t == '!') {
             L->negated (true);
@@ -256,9 +256,9 @@ aclDestroyAcls(ACL ** head)
 }
 
 void
-aclDestroyAclList(acl_list ** head)
+aclDestroyAclList(ACLList ** head)
 {
-    acl_list *l;
+    ACLList *l;
     debugs(28, 8, "aclDestroyAclList: invoked");
 
     for (l = *head; l; l = *head) {
diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 939d18061e..814a8fab12 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.cc,v 1.519 2007/08/17 03:35:31 hno Exp $
+ * $Id: cache_cf.cc,v 1.520 2007/09/01 05:56:37 amosjeffries Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -847,9 +847,9 @@ free_acl(ACL ** ae)
 }
 
 static void
-dump_acl_list(StoreEntry * entry, acl_list * head)
+dump_acl_list(StoreEntry * entry, ACLList * head)
 {
-    acl_list *l;
+    ACLList *l;
 
     for (l = head; l; l = l->next) {
         storeAppendPrintf(entry, " %s%s",
diff --git a/src/structs.h b/src/structs.h
index 6ec0f64ed3..58400f033b 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.561 2007/08/13 17:20:51 hno Exp $
+ * $Id: structs.h,v 1.562 2007/09/01 05:56:37 amosjeffries Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -91,7 +91,7 @@ struct _snmp_request_t
 struct _acl_address
 {
     acl_address *next;
-    acl_list *aclList;
+    ACLList *aclList;
 
     struct IN_ADDR addr;
 };
@@ -99,14 +99,14 @@ struct _acl_address
 struct _acl_tos
 {
     acl_tos *next;
-    acl_list *aclList;
+    ACLList *aclList;
     int tos;
 };
 
 struct _acl_size_t
 {
     acl_size_t *next;
-    acl_list *aclList;
+    ACLList *aclList;
     int64_t size;
 };
 
@@ -1696,7 +1696,7 @@ struct _logformat
 struct _customlog
 {
     char *filename;
-    acl_list *aclList;
+    ACLList *aclList;
     logformat *logFormat;
     Logfile *logfile;
     customlog *next;