From 5ea3aff4924ba17bf16f0b033fb788bcf3b4b5d4 Mon Sep 17 00:00:00 2001 From: hno <> Date: Mon, 18 Jun 2007 03:39:49 +0000 Subject: [PATCH] Make ACLChecklist::matchAclListSlow a private member function. Not part of the public API --- src/ACLChecklist.cc | 8 +++++++- src/ACLChecklist.cci | 7 +------ src/ACLChecklist.h | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/ACLChecklist.cc b/src/ACLChecklist.cc index 6b88879f52..2a5d4c23e1 100644 --- a/src/ACLChecklist.cc +++ b/src/ACLChecklist.cc @@ -1,5 +1,5 @@ /* - * $Id: ACLChecklist.cc,v 1.38 2007/05/09 09:07:38 wessels Exp $ + * $Id: ACLChecklist.cc,v 1.39 2007/06/17 21:39:49 hno Exp $ * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels @@ -275,6 +275,12 @@ ACLChecklist::checkCallback(allow_t answer) delete this; } +void +ACLChecklist::matchAclListSlow(const acl_list * list) +{ + matchAclList(list, false); +} + void ACLChecklist::matchAclList(const acl_list * head, bool const fast) { diff --git a/src/ACLChecklist.cci b/src/ACLChecklist.cci index 2e8651a810..aa253b95db 100644 --- a/src/ACLChecklist.cci +++ b/src/ACLChecklist.cci @@ -1,5 +1,5 @@ /* - * $Id: ACLChecklist.cci,v 1.4 2007/04/25 11:30:18 adrian Exp $ + * $Id: ACLChecklist.cci,v 1.5 2007/06/17 21:39:49 hno Exp $ * * DEBUG: section 28 Access Control * AUTHOR: Henrik Nordstrom @@ -39,8 +39,3 @@ ACLChecklist::matchAclListFast(const acl_list * list) return finished(); } -void -ACLChecklist::matchAclListSlow(const acl_list * list) -{ - matchAclList(list, false); -} diff --git a/src/ACLChecklist.h b/src/ACLChecklist.h index 6228e03cc6..3a7a188fbd 100644 --- a/src/ACLChecklist.h +++ b/src/ACLChecklist.h @@ -1,6 +1,6 @@ /* - * $Id: ACLChecklist.h,v 1.24 2007/05/09 07:36:24 wessels Exp $ + * $Id: ACLChecklist.h,v 1.25 2007/06/17 21:39:49 hno Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -97,7 +97,6 @@ class NullState : public AsyncState void checkCallback(allow_t answer); void preCheck(); _SQUID_INLINE_ bool matchAclListFast(const acl_list * list); - _SQUID_INLINE_ void matchAclListSlow(const acl_list * list); ConnStateData::Pointer conn(); void conn(ConnStateData::Pointer); int authenticated(); @@ -143,6 +142,7 @@ class NullState : public AsyncState private: void matchAclList(const acl_list * list, bool const fast); + void matchAclListSlow(const acl_list * list); CBDATA_CLASS(ACLChecklist); ConnStateData::Pointer conn_; /* hack for ident and NTLM */ bool async_; -- 2.47.2