Incorporated Amos suggestions

diff --git a/src/acl/Arp.cc b/src/acl/Arp.cc
index d6048f3dbe64aac5e8c42104d91826afefa980c2..dc5991ddb421a73453181706b9b7042592af2d59 100644 (file)
--- a/src/acl/Arp.cc
+++ b/src/acl/Arp.cc
@@ -35,10 +35,6 @@ ACLARP::ACLARP (ACLARP const & old) : class_ (old.class_), aclArpData(old.aclArp
 {
 }
 
-ACLARP::~ACLARP()
-{
-}
-
 char const *
 ACLARP::typeString() const
 {

diff --git a/src/acl/Arp.h b/src/acl/Arp.h
index d502b28ae86c2486031a6ac050fb25c0c12d1083..3c508ac9b4573a382db47593b6567bb9d25db18a 100644 (file)
--- a/src/acl/Arp.h
+++ b/src/acl/Arp.h
@@ -11,7 +11,6 @@
 
 #include "acl/Acl.h"
 #include "acl/Checklist.h"
-#include "splay.h"
 
 #include <set>
 
@@ -28,7 +27,7 @@ class ACLARP : public ACL
 public:
     ACLARP(char const *);
     ACLARP(ACLARP const &);
-    ~ACLARP();
+    ~ACLARP() {}
     ACLARP&operator=(ACLARP const &);
 
     virtual ACL *clone()const;

diff --git a/src/acl/CertificateData.cc b/src/acl/CertificateData.cc
index 3c421fe8bec20dbab05949047b54a73c1717c549..050bdafa125c3364744bb73ad7043b050145d7d1 100644 (file)
--- a/src/acl/CertificateData.cc
+++ b/src/acl/CertificateData.cc
@@ -71,13 +71,6 @@ ACLCertificateData::match(X509 *cert)
     return values.match(value);
 }
 
-struct CertificateDataAclDumpVisitor {
-    SBufList contents;
-    void operator() (char * const & node_data) {
-        contents.push_back(SBuf(node_data));
-    }
-};
-
 SBufList
 ACLCertificateData::dump() const
 {
@@ -85,9 +78,7 @@ ACLCertificateData::dump() const
     if (validAttributesStr)
         sl.push_back(SBuf(attribute));
 
-    CertificateDataAclDumpVisitor visitor;
-    values.values->visit(visitor);
-    sl.splice(sl.end(),visitor.contents);
+    sl.splice(sl.end(),values.dump());
     return sl;
 }
 

diff --git a/src/acl/Eui64.cc b/src/acl/Eui64.cc
index e504c0e2b807b1c2047a32208be4d4d4f69ba215..c7286d45e62068b0e0ed4f9ecd3818e181ac20aa 100644 (file)
--- a/src/acl/Eui64.cc
+++ b/src/acl/Eui64.cc
@@ -33,10 +33,6 @@ ACLEui64::ACLEui64 (ACLEui64 const & old) : eui64Data(old.eui64Data), class_ (ol
 {
 }
 
-ACLEui64::~ACLEui64()
-{
-}
-
 char const *
 ACLEui64::typeString() const
 {
@@ -78,13 +74,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 = strtokFile()) {
+        if (Eui::Eui64 * q = aclParseEuiData(t)) {
+            eui64Data.insert(*q);
+            safe_free(q);
+        }
     }
 }
 
@@ -115,7 +109,7 @@ ACLEui64::dump() const
 {
     SBufList sl;
     for (auto i = eui64Data.cbegin(); i != eui64Data.end(); ++i) {
-        char buf[48];
+        static char buf[48];
         i->encode(buf,48);
         sl.push_back(SBuf(buf));
     }

diff --git a/src/acl/Eui64.h b/src/acl/Eui64.h
index e098c8088688bd3a3d8c525d4d8d2aa5884ae878..9b36d462c5f85291803e49c462218df2d92839bc 100644 (file)
--- a/src/acl/Eui64.h
+++ b/src/acl/Eui64.h
@@ -11,7 +11,6 @@
 
 #include "acl/Acl.h"
 #include "acl/Checklist.h"
-#include "splay.h"
 
 #include <set>
 
@@ -27,7 +26,7 @@ class ACLEui64 : public ACL
 public:
     ACLEui64(char const *);
     ACLEui64(ACLEui64 const &);
-    ~ACLEui64();
+    ~ACLEui64() {}
     ACLEui64&operator=(ACLEui64 const &);
 
     virtual ACL *clone()const;

diff --git a/src/acl/StringData.cc b/src/acl/StringData.cc
index 46ed775beab20ba34f70747e4146b7f181f85301..59a03f233b35c1f377b383146f91008069df1b4c 100644 (file)
--- a/src/acl/StringData.cc
+++ b/src/acl/StringData.cc
@@ -14,17 +14,10 @@
 #include "cache_cf.h"
 #include "Debug.h"
 
-ACLStringData::ACLStringData()
-{}
-
 ACLStringData::ACLStringData(ACLStringData const &old) : stringValues(old.stringValues)
 {
 }
 
-ACLStringData::~ACLStringData()
-{
-}
-
 void
 ACLStringData::insert(const char *value)
 {

diff --git a/src/acl/StringData.h b/src/acl/StringData.h
index 79097ef72d942857a5c64d99a6cff28cdf61c06f..d017c0e64382583be7d83f3078941ddf57edab00 100644 (file)
--- a/src/acl/StringData.h
+++ b/src/acl/StringData.h
@@ -20,10 +20,10 @@ class ACLStringData : public ACLData<char const *>
     MEMPROXY_CLASS(ACLStringData);
 
 public:
-    ACLStringData();
+    ACLStringData() {}
     ACLStringData(ACLStringData const &);
     ACLStringData &operator= (ACLStringData const &);
-    virtual ~ACLStringData();
+    virtual ~ACLStringData() {}
     bool match(char const *);
     virtual SBufList dump() const;
     virtual void parse();

diff --git a/src/acl/UserData.cc b/src/acl/UserData.cc
index 8b4fbdfb2c8df1b22e11fdf250a8392201e950c6..70f46ad163425f43bedb8ef74390cd0fc4806edf 100644 (file)
--- a/src/acl/UserData.cc
+++ b/src/acl/UserData.cc
@@ -14,12 +14,8 @@
 #include "ConfigParser.h"
 #include "Debug.h"
 #include "globals.h"
-#include "util.h"
 #include "SBufAlgos.h"
-
-ACLUserData::~ACLUserData()
-{
-}
+#include "util.h"
 
 bool
 ACLUserData::match(char const *user)
@@ -52,7 +48,7 @@ ACLUserData::dump() const
     if (flags.case_insensitive)
         sl.push_back(SBuf("-i"));
 
-    sl.insert(sl.end(), userDataNames.begin(), userDataNames.end());
+    sl.insert(sl.end(), userDataNames.cbegin(), userDataNames.cend());
 
     debugs(28,5, "ACLUserData dump output: " << SBufContainerJoin(userDataNames,SBuf(" ")));
     return sl;

diff --git a/src/acl/UserData.h b/src/acl/UserData.h
index 9aec5751e5acdbcab9f595640fa3dc045d201d07..6b2c767b3906f8504fce4a889fcb8fe711157e05 100644 (file)
--- a/src/acl/UserData.h
+++ b/src/acl/UserData.h
@@ -12,7 +12,6 @@
 #include "acl/Acl.h"
 #include "acl/Data.h"
 #include "SBuf.h"
-#include "splay.h"
 
 #include <set>
 
@@ -21,7 +20,7 @@ class ACLUserData : public ACLData<char const *>
     MEMPROXY_CLASS(ACLUserData);
 
 public:
-    virtual ~ACLUserData();
+    virtual ~ACLUserData() {}
     bool match(char const *user);
     virtual SBufList dump() const;
     void parse();