Cleanup: zap CVS Id tags

[thirdparty/squid.git] / src / ACLProtocolData.cc

diff --git a/src/ACLProtocolData.cc b/src/ACLProtocolData.cc
index f6b5eab0fc85c1d50c652e1d2cda57cd65e9ef1f..a087ea6e75e7877f9231df162c3a11b11fa0f460 100644 (file)
--- a/src/ACLProtocolData.cc
+++ b/src/ACLProtocolData.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLProtocolData.cc,v 1.6 2005/05/08 06:36:45 hno Exp $
+ * $Id$
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -20,12 +20,12 @@
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
- *  
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *  
+ *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
@@ -37,6 +37,8 @@
 #include "squid.h"
 #include "ACLProtocolData.h"
 #include "ACLChecklist.h"
+#include "URLScheme.h"
+#include "wordlist.h"
 
 ACLProtocolData::ACLProtocolData() : values (NULL)
 {}
@@ -60,14 +62,15 @@ ACLProtocolData::match(protocol_t toFind)
 
 /* explicit instantiation required for some systems */
 
-template cbdata_type List<protocol_t>
-::CBDATA_List;
+/// \cond AUTODOCS-IGNORE
+template cbdata_type CbDataList<protocol_t>::CBDATA_CbDataList;
+/// \endcond
 
 wordlist *
 ACLProtocolData::dump()
 {
     wordlist *W = NULL;
-    List<protocol_t> *data = values;
+    CbDataList<protocol_t> *data = values;
 
     while (data != NULL) {
         wordlistAdd(&W, ProtocolStr[data->element]);
@@ -80,14 +83,12 @@ ACLProtocolData::dump()
 void
 ACLProtocolData::parse()
 {
-    List<protocol_t> **Tail;
+    CbDataList<protocol_t> **Tail;
     char *t = NULL;
 
-    for (Tail = &values; *Tail; Tail = &((*Tail)->next))
-
-        ;
+    for (Tail = &values; *Tail; Tail = &((*Tail)->next));
     while ((t = strtokFile())) {
-        List<protocol_t> *q = new List<protocol_t> (urlParseProtocol(t));
+        CbDataList<protocol_t> *q = new CbDataList<protocol_t> (urlParseProtocol(t));
         *(Tail) = q;
         Tail = &q->next;
     }