Source Format Enforcement (#1234)

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

diff --git a/src/acl/DomainData.cc b/src/acl/DomainData.cc
index cbefc12e6ef2def2da8eb3c5403b8d5cab5e7649..cb5fd89951b01008df115f9aa9163e59d30973a7 100644 (file)
--- a/src/acl/DomainData.cc
+++ b/src/acl/DomainData.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2023 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -11,10 +11,10 @@
 #include "squid.h"
 #include "acl/Checklist.h"
 #include "acl/DomainData.h"
+#include "anyp/Uri.h"
 #include "cache_cf.h"
 #include "ConfigParser.h"
-#include "Debug.h"
-#include "src/URL.h"
+#include "debug/Stream.h"
 #include "util.h"
 
 template<class T>
@@ -80,7 +80,7 @@ aclDomainCompare(T const &a, T const &b)
             bool d3big = (strlen(d3) > strlen(d4)); // Always suggest removing the longer one.
             debugs(28, DBG_IMPORTANT, "WARNING: '" << (d3big?d3:d4) << "' is a subdomain of '" << (d3big?d4:d3) << "'");
             debugs(28, DBG_IMPORTANT, "WARNING: You should remove '" << (d3big?d3:d4) << "' from the ACL named '" << AclMatchedName << "'");
-            debugs(28, 2, HERE << "Ignore '" << d3 << "' to keep splay tree searching predictable");
+            debugs(28, 2, "Ignore '" << d3 << "' to keep splay tree searching predictable");
         }
     } else if (ret == 0) {
         // It may be an exact duplicate. No problem. Just drop.
@@ -104,7 +104,7 @@ aclDomainCompare(T const &a, T const &b)
 bool
 ACLDomainData::match(char const *host)
 {
-    if (host == NULL)
+    if (host == nullptr)
         return 0;
 
     debugs(28, 3, "aclMatchDomainList: checking '" << host << "'");
@@ -114,7 +114,7 @@ ACLDomainData::match(char const *host)
 
     debugs(28, 3, "aclMatchDomainList: '" << host << "' " << (result ? "found" : "NOT found"));
 
-    return (result != NULL);
+    return (result != nullptr);
 }
 
 struct AclDomainDataDumpVisitor {
@@ -150,11 +150,3 @@ ACLDomainData::empty() const
     return domains->empty();
 }
 
-ACLData<char const *> *
-ACLDomainData::clone() const
-{
-    /* Splay trees don't clone yet. */
-    assert (!domains);
-    return new ACLDomainData;
-}
-