Source Format Enforcement (#763)

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

diff --git a/src/acl/StringData.cc b/src/acl/StringData.cc
index fa9265037b9945def9dca5c78c072e6330a65276..3bec669a2ca770d00b448c8da4cb0d93150bfc3a 100644 (file)
--- a/src/acl/StringData.cc
+++ b/src/acl/StringData.cc
@@ -1,125 +1,75 @@
 /*
- * $Id$
+ * Copyright (C) 1996-2021 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"
-
-
-ACLStringData::ACLStringData() : values (NULL)
-{}
-
-ACLStringData::ACLStringData(ACLStringData const &old) : values (NULL)
-{
-    assert (!old.values);
-}
-
-template<class T>
-inline void
-xRefFree(T &thing)
-{
-    xfree (thing);
-}
+#include "acl/StringData.h"
+#include "ConfigParser.h"
+#include "Debug.h"
 
-ACLStringData::~ACLStringData()
+ACLStringData::ACLStringData(ACLStringData const &old) : stringValues(old.stringValues)
 {
-    if (values)
-        values->destroy(xRefFree);
 }
 
-static int
-splaystrcmp (char * const &l, char * const &r)
+void
+ACLStringData::insert(const char *value)
 {
-    return strcmp (l,r);
+    stringValues.insert(SBuf(value));
 }
 
 bool
-ACLStringData::match(char const *toFind)
+ACLStringData::match(const SBuf &tf)
 {
-    if (!values || !toFind)
+    if (stringValues.empty() || tf.isEmpty())
         return 0;
 
-    debugs(28, 3, "aclMatchStringList: checking '" << toFind << "'");
-
-    values = values->splay((char *)toFind, splaystrcmp);
+    debugs(28, 3, "aclMatchStringList: checking '" << tf << "'");
 
-    debugs(28, 3, "aclMatchStringList: '" << toFind << "' " << (splayLastResult ? "NOT found" : "found"));
+    bool found = (stringValues.find(tf) != stringValues.end());
+    debugs(28, 3, "aclMatchStringList: '" << tf << "' " << (found ? "found" : "NOT found"));
 
-    return !splayLastResult;
+    return found;
 }
 
-static void
-aclDumpStringWalkee(char * const & node_data, void *outlist)
+// XXX: performance regression due to SBuf(char*) data-copies.
+bool
+ACLStringData::match(char const *toFind)
 {
-    /* outlist is really a wordlist ** */
-    wordlistAdd((wordlist **)outlist, node_data);
+    return match(SBuf(toFind));
 }
 
-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;
+    SBufList sl;
+    sl.insert(sl.end(), stringValues.begin(), stringValues.end());
+    return sl;
 }
 
 void
 ACLStringData::parse()
 {
-    char *t;
-
-    while ((t = strtokFile()))
-        values = values->insert(xstrdup(t), splaystrcmp);
+    while (const char *t = ConfigParser::strtokFile())
+        stringValues.insert(SBuf(t));
 }
 
 bool
 ACLStringData::empty() const
 {
-    return values->empty();
+    return stringValues.empty();
 }
 
 ACLData<char const *> *
 ACLStringData::clone() const
 {
     /* Splay trees don't clone yet. */
-    assert (!values);
     return new ACLStringData(*this);
 }
+