Source Format Enforcement (#532)

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

diff --git a/src/acl/Eui64.cc b/src/acl/Eui64.cc
index 005bf85fe372ca6c3e97d2ad22dc8a7bdc69b33c..30ea5f61cb4e4b5bc93ce366640d067db99cffd3 100644 (file)
--- a/src/acl/Eui64.cc
+++ b/src/acl/Eui64.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2020 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -14,7 +14,6 @@
 
 #include "acl/Eui64.h"
 #include "acl/FilledChecklist.h"
-#include "cache_cf.h"
 #include "Debug.h"
 #include "eui/Eui64.h"
 #include "globals.h"
@@ -33,10 +32,6 @@ ACLEui64::ACLEui64 (ACLEui64 const & old) : eui64Data(old.eui64Data), class_ (ol
 {
 }
 
-ACLEui64::~ACLEui64()
-{
-}
-
 char const *
 ACLEui64::typeString() const
 {
@@ -58,14 +53,14 @@ aclParseEuiData(const char *t)
 
     if (sscanf(t, "%[0-9a-fA-F:]", buf) != 1) {
         debugs(28, DBG_CRITICAL, "aclParseEuiData: Bad EUI-64 address: '" << t << "'");
-        safe_free(q);
+        delete q;
         return NULL;
     }
 
     if (!q->decode(buf)) {
         debugs(28, DBG_CRITICAL, "" << cfg_filename << " line " << config_lineno << ": " << config_input_line);
         debugs(28, DBG_CRITICAL, "aclParseEuiData: Ignoring invalid EUI-64 acl entry: can't parse '" << buf << "'");
-        safe_free(q);
+        delete q;
         return NULL;
     }
 
@@ -78,13 +73,11 @@ aclParseEuiData(const char *t)
 void
 ACLEui64::parse()
 {
-    char *t = NULL;
-    Eui::Eui64 *q;
-    while ((t = strtokFile())) {
-        if ((q = aclParseEuiData(t)) == NULL)
-            continue;
-        eui64Data.insert(*q);
-        safe_free(q);
+    while (const char * t = ConfigParser::strtokFile()) {
+        if (Eui::Eui64 * q = aclParseEuiData(t)) {
+            eui64Data.insert(*q);
+            delete q;
+        }
     }
 }
 
@@ -114,8 +107,8 @@ SBufList
 ACLEui64::dump() const
 {
     SBufList sl;
-    for (auto i = eui64Data.cbegin(); i != eui64Data.end(); ++i) {
-        char buf[48];
+    for (auto i = eui64Data.begin(); i != eui64Data.end(); ++i) {
+        static char buf[48];
         i->encode(buf,48);
         sl.push_back(SBuf(buf));
     }