Minor edits after audit

diff --git a/src/AccessLogEntry.cc b/src/AccessLogEntry.cc
index 22ca54ab83c9a09b327a13b9e166fedaaac6498d..ed9a410f69d76859f6fe36a21b308e9f59595260 100644 (file)
--- a/src/AccessLogEntry.cc
+++ b/src/AccessLogEntry.cc
@@ -62,6 +62,9 @@ AccessLogEntry::~AccessLogEntry()
     safe_free(headers.adapted_request);
     HTTPMSGUNLOCK(adapted_request);
 
+    safe_free(lastAclName);
+    safe_free(lastAclData);
+
     HTTPMSGUNLOCK(reply);
     HTTPMSGUNLOCK(request);
 #if ICAP_CLIENT

diff --git a/src/AccessLogEntry.h b/src/AccessLogEntry.h
index cce7425390e16773e535a346c01eee2d2375d451..b3020746c24cc6b54916fc7e704abd3c77d58dd4 100644 (file)
--- a/src/AccessLogEntry.h
+++ b/src/AccessLogEntry.h
@@ -39,8 +39,14 @@ class AccessLogEntry: public RefCountable
 public:
     typedef RefCount<AccessLogEntry> Pointer;
 
-    AccessLogEntry() : url(NULL), tcpClient(), reply(NULL), request(NULL),
-        adapted_request(NULL) {}
+    AccessLogEntry() :
+        url(nullptr),
+        lastAclName(nullptr),
+        lastAclData(nullptr),
+        reply(nullptr),
+        request(nullptr),
+        adapted_request(nullptr)
+    {}
     ~AccessLogEntry();
 
     /// Fetch the client IP log string into the given buffer.
@@ -203,17 +209,14 @@ public:
     {
 
     public:
-        Private() : method_str(NULL), lastAclName(NULL), lastAclData(NULL) {}
-        ~Private() {
-            safe_free(lastAclName);
-            safe_free(lastAclData);
-        }
+        Private() : method_str(NULL) {}
 
         const char *method_str;
-        const char *lastAclName; ///< string for external_acl_type %ACL format code
-        const char *lastAclData; ///< string for external_acl_type %DATA format code
-
     } _private;
+
+    const char *lastAclName; ///< string for external_acl_type %ACL format code
+    const char *lastAclData; ///< string for external_acl_type %DATA format code
+
     HierarchyLogEntry hier;
     HttpReply *reply;
     HttpRequest *request; //< virgin HTTP request

diff --git a/src/ExternalACL.h b/src/ExternalACL.h
index 1299c017ba58c1870971072f81a2d3265ccf3d52..4bd3d4c78eb272ca4baedaadfc93a1770eed9301 100644 (file)
--- a/src/ExternalACL.h
+++ b/src/ExternalACL.h
@@ -51,7 +51,7 @@ public:
     virtual void parse();
     virtual int match(ACLChecklist *checklist);
     /* This really should be dynamic based on the external class defn */
-    virtual bool requiresAleXXX() const {return true;}
+    virtual bool requiresAle() const {return true;}
     virtual bool requiresRequest() const {return true;}
 
     /* when requiresRequest is made dynamic, review this too */

diff --git a/src/acl/Acl.cc b/src/acl/Acl.cc
index 7da4f15b8e52b8e4b7900c6d0ff7f1012d13b7c1..91449e442b8b9aaeffc0e937418e38066c049863 100644 (file)
--- a/src/acl/Acl.cc
+++ b/src/acl/Acl.cc
@@ -153,7 +153,7 @@ ACL::matches(ACLChecklist *checklist) const
     AclMatchedName = name;
 
     int result = 0;
-    if (!checklist->hasAleXXX() && requiresAleXXX()) {
+    if (!checklist->hasAle() && requiresAle()) {
         debugs(28, DBG_IMPORTANT, "WARNING: " << name << " ACL is used in " <<
                "context without an ALE state. Assuming mismatch.");
     } else if (!checklist->hasRequest() && requiresRequest()) {
@@ -371,7 +371,7 @@ aclCacheMatchFlush(dlink_list * cache)
 }
 
 bool
-ACL::requiresAleXXX() const
+ACL::requiresAle() const
 {
     return false;
 }

diff --git a/src/acl/Acl.h b/src/acl/Acl.h
index 9104ab624272e7f9bd44d0e6078b1679a3b40708..56904f108ce3bec0d3433d4625405eebab2618ec 100644 (file)
--- a/src/acl/Acl.h
+++ b/src/acl/Acl.h
@@ -142,7 +142,7 @@ private:
     virtual int match(ACLChecklist *checklist) = 0; // XXX: missing const
 
     /// whether our (i.e. shallow) match() requires checklist to have a AccessLogEntry
-    virtual bool requiresAleXXX() const;
+    virtual bool requiresAle() const;
     /// whether our (i.e. shallow) match() requires checklist to have a request
     virtual bool requiresRequest() const;
     /// whether our (i.e. shallow) match() requires checklist to have a reply

diff --git a/src/acl/Checklist.h b/src/acl/Checklist.h
index 025e3a5e6ef9720e79d8233ca023dabfd85af151..aa07cf5e45c5fcfca9cae93de674b011036ea301 100644 (file)
--- a/src/acl/Checklist.h
+++ b/src/acl/Checklist.h
@@ -163,7 +163,7 @@ public:
     // for ACL::checklistMatches to use
     virtual bool hasRequest() const = 0;
     virtual bool hasReply() const = 0;
-    virtual bool hasAleXXX() const = 0;
+    virtual bool hasAle() const = 0;
 
     /// change the current ACL list
     /// \return a pointer to the old list value (may be nullptr)

diff --git a/src/acl/FilledChecklist.h b/src/acl/FilledChecklist.h
index 211fc5adbac6154167bd99fcb49ae781c167fdd9..c8ff41c1f59dcb42b86c815ea5369674cd470675 100644 (file)
--- a/src/acl/FilledChecklist.h
+++ b/src/acl/FilledChecklist.h
@@ -62,7 +62,7 @@ public:
     // ACLChecklist API
     virtual bool hasRequest() const { return request != NULL; }
     virtual bool hasReply() const { return reply != NULL; }
-    virtual bool hasAleXXX() const { return al != NULL; }
+    virtual bool hasAle() const { return al != NULL; }
 
 public:
     Ip::Address src_addr;

diff --git a/src/external_acl.cc b/src/external_acl.cc
index 86338a4472a928fd2a3d6612c73d2a48405137f9..9c643b505f8980331ea471d3e3478f665d6d307c 100644 (file)
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -718,8 +718,8 @@ makeExternalAclKey(ACLFilledChecklist * ch, external_acl_data * acl_data)
 
         if (t->type == Format::LFT_EXT_ACL_NAME) {
             // setup for %ACL
-            safe_free(ch->al->_private.lastAclName);
-            ch->al->_private.lastAclName = xstrdup(acl_data->name);
+            safe_free(ch->al->lastAclName);
+            ch->al->lastAclName = xstrdup(acl_data->name);
         }
 
         if (t->type == Format::LFT_EXT_ACL_DATA) {
@@ -741,7 +741,7 @@ makeExternalAclKey(ACLFilledChecklist * ch, external_acl_data * acl_data)
                 }
             }
 
-            ch->al->_private.lastAclData = sb.c_str();
+            ch->al->lastAclData = xstrdup(sb.c_str());
         }
 
 #if USE_IDENT

diff --git a/src/format/Format.cc b/src/format/Format.cc
index addc60ba8de85ee06b38f05612d7e57885dfe322..5553990f33b6bba7ac995709e8cd1c59a205115e 100644 (file)
--- a/src/format/Format.cc
+++ b/src/format/Format.cc
@@ -1288,11 +1288,11 @@ Format::Format::assemble(MemBuf &mb, const AccessLogEntry::Pointer &al, int logS
             break;
 
         case LFT_EXT_ACL_NAME:
-            out = al->_private.lastAclName;
+            out = al->lastAclName;
             break;
 
         case LFT_EXT_ACL_DATA:
-            out = al->_private.lastAclData;
+            out = al->lastAclData;
             break;
         }