SourceFormat Enforcement

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

diff --git a/src/acl/MethodData.cc b/src/acl/MethodData.cc
index 295bd0639a9fa06d025073816d434f5154d1cdf5..2144ca6dd3c7e1329e88c448f57a990defd28a3e 100644 (file)
--- a/src/acl/MethodData.cc
+++ b/src/acl/MethodData.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2017 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -11,47 +11,41 @@
 #include "squid.h"
 #include "acl/Checklist.h"
 #include "acl/MethodData.h"
-#include "cache_cf.h"
+#include "ConfigParser.h"
 #include "http/RequestMethod.h"
 
 int ACLMethodData::ThePurgeCount = 0;
 
-ACLMethodData::ACLMethodData() : values (NULL)
-{}
-
-ACLMethodData::ACLMethodData(ACLMethodData const &old) : values (NULL)
+ACLMethodData::ACLMethodData(ACLMethodData const &old)
 {
-    assert (!old.values);
+    assert(old.values.empty());
 }
 
 ACLMethodData::~ACLMethodData()
 {
-    if (values)
-        delete values;
+    values.clear();
 }
 
-/// todo make this a pass-by-reference now that HTTPRequestMethods a full class?
 bool
 ACLMethodData::match(HttpRequestMethod toFind)
 {
-    return values->findAndTune(toFind);
+    for (auto i = values.begin(); i != values.end(); ++i) {
+        if (*i == toFind) {
+            // tune the list for LRU ordering
+            values.erase(i);
+            values.push_front(toFind);
+            return true;
+        }
+    }
+    return false;
 }
 
-/* explicit instantiation required for some systems */
-
-/// \cond AUTODOCS_IGNORE
-template cbdata_type CbDataList<HttpRequestMethod>::CBDATA_CbDataList;
-/// \endcond
-
 SBufList
 ACLMethodData::dump() const
 {
     SBufList sl;
-    CbDataList<HttpRequestMethod> *data = values;
-
-    while (data != NULL) {
-        sl.push_back(data->element.image());
-        data = data->next;
+    for (std::list<HttpRequestMethod>::const_iterator i = values.begin(); i != values.end(); ++i) {
+        sl.push_back((*i).image());
     }
 
     return sl;
@@ -60,28 +54,19 @@ ACLMethodData::dump() const
 void
 ACLMethodData::parse()
 {
-    CbDataList<HttpRequestMethod> **Tail;
-    char *t = NULL;
-
-    for (Tail = &values; *Tail; Tail = &((*Tail)->next));
-    while ((t = strtokFile())) {
-        CbDataList<HttpRequestMethod> *q = new CbDataList<HttpRequestMethod> (HttpRequestMethod(t));
-        if (q->element == Http::METHOD_PURGE)
+    while (char *t = ConfigParser::strtokFile()) {
+        HttpRequestMethod m;
+        m.HttpRequestMethodXXX(t);
+        values.push_back(m);
+        if (values.back() == Http::METHOD_PURGE)
             ++ThePurgeCount; // configuration code wants to know
-        *(Tail) = q;
-        Tail = &q->next;
     }
 }
 
-bool
-ACLMethodData::empty() const
-{
-    return values == NULL;
-}
-
 ACLData<HttpRequestMethod> *
 ACLMethodData::clone() const
 {
-    assert (!values);
+    assert(values.empty());
     return new ACLMethodData(*this);
 }
+