SourceFormat Enforcement

[thirdparty/squid.git] / src / acl / StringData.cc

diff --git a/src/acl/StringData.cc b/src/acl/StringData.cc
index fa9265037b9945def9dca5c78c072e6330a65276..8b48e119b5bce4cbb2fdfba5b501e26c663e095b 100644 (file)
--- a/src/acl/StringData.cc
+++ b/src/acl/StringData.cc
@@ -1,44 +1,18 @@
 /*
- * $Id$
+ * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
  *
- * DEBUG: section 28    Access Control
- * AUTHOR: Duane Wessels
- *
- * SQUID Web Proxy Cache          http://www.squid-cache.org/
- * ----------------------------------------------------------
- *
- *  Squid is the result of efforts by numerous individuals from
- *  the Internet community; see the CONTRIBUTORS file for full
- *  details.   Many organizations have provided support for Squid's
- *  development; see the SPONSORS file for full details.  Squid is
- *  Copyrighted (C) 2001 by the Regents of the University of
- *  California; see the COPYRIGHT file for full details.  Squid
- *  incorporates software developed and/or copyrighted by other
- *  sources; see the CREDITS file for full details.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  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.
- *
- *
- * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
  */
 
+/* DEBUG: section 28    Access Control */
+
 #include "squid.h"
-#include "acl/StringData.h"
 #include "acl/Checklist.h"
-#include "wordlist.h"
-
+#include "acl/StringData.h"
+#include "cache_cf.h"
+#include "Debug.h"
 
 ACLStringData::ACLStringData() : values (NULL)
 {}
@@ -57,8 +31,10 @@ xRefFree(T &thing)
 
 ACLStringData::~ACLStringData()
 {
-    if (values)
+    if (values) {
         values->destroy(xRefFree);
+        delete values;
+    }
 }
 
 static int
@@ -67,6 +43,12 @@ splaystrcmp (char * const &l, char * const &r)
     return strcmp (l,r);
 }
 
+void
+ACLStringData::insert(const char *value)
+{
+    values->insert(xstrdup(value), splaystrcmp);
+}
+
 bool
 ACLStringData::match(char const *toFind)
 {
@@ -75,39 +57,38 @@ ACLStringData::match(char const *toFind)
 
     debugs(28, 3, "aclMatchStringList: checking '" << toFind << "'");
 
-    values = values->splay((char *)toFind, splaystrcmp);
+    char * const * result = values->find(const_cast<char *>(toFind), splaystrcmp);
 
-    debugs(28, 3, "aclMatchStringList: '" << toFind << "' " << (splayLastResult ? "NOT found" : "found"));
+    debugs(28, 3, "aclMatchStringList: '" << toFind << "' " << (result ? "found" : "NOT found"));
 
-    return !splayLastResult;
+    return (result != NULL);
 }
 
-static void
-aclDumpStringWalkee(char * const & node_data, void *outlist)
-{
-    /* outlist is really a wordlist ** */
-    wordlistAdd((wordlist **)outlist, node_data);
-}
+// visitor functor to collect the contents of the Arp Acl
+struct StringDataAclDumpVisitor {
+    SBufList contents;
+    void operator() (char * const& node_data) {
+        contents.push_back(SBuf(node_data));
+    }
+};
 
-wordlist *
-ACLStringData::dump()
+SBufList
+ACLStringData::dump() const
 {
-    wordlist *wl = NULL;
-    /* damn this is VERY inefficient for long ACL lists... filling
-     * a wordlist this way costs Sum(1,N) iterations. For instance
-     * a 1000-elements list will be filled in 499500 iterations.
-     */
-    values->walk(aclDumpStringWalkee, &wl);
-    return wl;
+    StringDataAclDumpVisitor visitor;
+    values->visit(visitor);
+    return visitor.contents;
 }
 
 void
 ACLStringData::parse()
 {
-    char *t;
+    if (!values)
+        values = new Splay<char *>();
 
+    char *t;
     while ((t = strtokFile()))
-        values = values->insert(xstrdup(t), splaystrcmp);
+        values->insert(xstrdup(t), splaystrcmp);
 }
 
 bool
@@ -123,3 +104,4 @@ ACLStringData::clone() const
     assert (!values);
     return new ACLStringData(*this);
 }
+