From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 30 May 2009 11:30:07 +0000 (+1200)
Subject: Make tag ACL play nice under current source layout.
X-Git-Tag: SQUID_3_2_0_1~994
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2071bb4a35b768083bec9b8d4bd1a86b3ce7834c;p=thirdparty%2Fsquid.git

Make tag ACL play nice under current source layout.

Few bits I missed during the initial merge.
---

diff --git a/src/acl/Tag.cc b/src/acl/Tag.cc
index e63a7f0306..bc81eb70a4 100644
--- a/src/acl/Tag.cc
+++ b/src/acl/Tag.cc
@@ -35,22 +35,16 @@
  */
 
 #include "squid.h"
-#include "ACLTag.h"
-#include "ACLStringData.h"
-#include "ACLChecklist.h"
+#include "acl/Tag.h"
+#include "acl/StringData.h"
+#include "acl/Checklist.h"
 #include "HttpRequest.h"
 
-/* explicit template instantiation required for some systems */
-
-ACL::Prototype ACLTag::RegistryProtoype(&ACLTag::RegistryEntry_, "tag");
-
-ACLStrategised<const char *> ACLTag::RegistryEntry_(new ACLStringData, ACLTagStrategy::Instance(), "tag");
-
 int
-ACLTagStrategy::match (ACLData<MatchType> * &data, ACLChecklist *checklist)
+ACLTagStrategy::match (ACLData<MatchType> * &data, ACLFilledChecklist *checklist)
 {
     if (checklist->conn() != NULL)
-	return data->match (checklist->request->tag.buf());
+	return data->match (checklist->request->tag.termedBuf());
     return 0;
 }
 
diff --git a/src/acl/Tag.h b/src/acl/Tag.h
index bce969aac4..5ff986a4fc 100644
--- a/src/acl/Tag.h
+++ b/src/acl/Tag.h
@@ -1,6 +1,5 @@
-
 /*
- * $Id: ACLTag.h,v 1.1.2.1 2008/02/27 10:06:42 amosjeffries Exp $
+ * $Id$
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -34,16 +33,17 @@
  * Copyright (c) 2009, Henrik Nordstrom <henrik@henriknordstrom.net>
  */
 
-#ifndef SQUID_ACLMYPORTNAME_H
-#define SQUID_ACLMYPORTNAME_H
-#include "ACLStrategy.h"
-#include "ACLStrategised.h"
+#ifndef SQUID_ACLTAG_H
+#define SQUID_ACLTAG_H
+
+#include "acl/Strategy.h"
+#include "acl/Strategised.h"
 
 class ACLTagStrategy : public ACLStrategy<const char *>
 {
 
 public:
-    virtual int match (ACLData<MatchType> * &, ACLChecklist *);
+    virtual int match (ACLData<MatchType> * &, ACLFilledChecklist *);
     static ACLTagStrategy *Instance();
     /* Not implemented to prevent copies of the instance. */
     /* Not private to prevent brain dead g+++ warnings about