Source Format Enforcement (#1234)

[thirdparty/squid.git] / src / ExternalACLEntry.cc

diff --git a/src/ExternalACLEntry.cc b/src/ExternalACLEntry.cc
index a9074fec7b01e3d29dfddb09da65f1c7b42f7917..e9269ccfc781bf835958efc9ff9c3049f8f75618 100644 (file)
--- a/src/ExternalACLEntry.cc
+++ b/src/ExternalACLEntry.cc
@@ -1,77 +1,28 @@
-
 /*
- * $Id$
- *
- * DEBUG: section 82    External ACL
- * AUTHOR: Henrik Nordstrom, MARA Systems AB
- *
- * SQUID Web Proxy Cache          http://www.squid-cache.org/
- * ----------------------------------------------------------
- *
- *  The contents of this file is Copyright (C) 2002 by MARA Systems AB,
- *  Sweden, unless otherwise is indicated in the specific function. The
- *  author gives his full permission to include this file into the Squid
- *  software product under the terms of the GNU General Public License as
- *  published by the Free Software Foundation; either version 2 of the
- *  License, or (at your option) any later version.
- *
- *  Squid is the result of efforts by numerous individuals from
- *  the Internet community; see the CONTRIBUTORS file for full
- *  details.   Many organizations have provided support for Squid's
- *  development; see the SPONSORS file for full details.  Squid is
- *  Copyrighted (C) 2001 by the Regents of the University of
- *  California; see the COPYRIGHT file for full details.  Squid
- *  incorporates software developed and/or copyrighted by other
- *  sources; see the CREDITS file for full details.
+ * Copyright (C) 1996-2023 The Squid Software Foundation and contributors
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
- *
- * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
  */
 
+/* DEBUG: section 82    External ACL */
+
 #include "squid.h"
 #include "ExternalACLEntry.h"
-#include "SquidTime.h"
+#include "time/gadgets.h"
 
 /******************************************************************
  * external_acl cache
  */
 
-CBDATA_CLASS_INIT(ExternalACLEntry);
-
-void *
-ExternalACLEntry::operator new (size_t byteCount)
+ExternalACLEntry::ExternalACLEntry() :
+    notes()
 {
-    /* derived classes with different sizes must implement their own new */
-    assert (byteCount == sizeof (ExternalACLEntry));
-    CBDATA_INIT_TYPE(ExternalACLEntry);
-    return cbdataAlloc(ExternalACLEntry);
-}
-
-void
-ExternalACLEntry::operator delete (void *address)
-{
-    cbdataFree (address);
-}
-
-ExternalACLEntry::ExternalACLEntry()
-{
-    lru.next = lru.prev = NULL;
-    result = 0;
+    lru.next = lru.prev = nullptr;
+    result = ACCESS_DENIED;
     date = 0;
-    def = NULL;
+    def = nullptr;
 }
 
 ExternalACLEntry::~ExternalACLEntry()
@@ -84,6 +35,11 @@ ExternalACLEntry::update(ExternalACLEntryData const &someData)
 {
     date = squid_curtime;
     result = someData.result;
+
+    // replace all notes. not combine
+    notes.clear();
+    notes.append(&someData.notes);
+
 #if USE_AUTH
     user = someData.user;
     password = someData.password;
@@ -92,3 +48,4 @@ ExternalACLEntry::update(ExternalACLEntryData const &someData)
     tag = someData.tag;
     log = someData.log;
 }
+