Source Format Enforcement (#1234)

[thirdparty/squid.git] / src / log / CustomLog.h

diff --git a/src/log/CustomLog.h b/src/log/CustomLog.h
index e995bc52e7fdc8fcde600fc1d85d5cc71fc721dc..3621e13f9270623517152294df2208153870fae8 100644 (file)
--- a/src/log/CustomLog.h
+++ b/src/log/CustomLog.h
@@ -1,52 +1,25 @@
-#ifndef SQUID_CUSTOMLOG_H_
-#define SQUID_CUSTOMLOG_H_
 /*
- * SQUID Web Proxy Cache          http://www.squid-cache.org/
- * ----------------------------------------------------------
- *
- *  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.
- *
- *  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) 1996-2023 The Squid Software Foundation and contributors
  *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
  */
-//#include "format/Format.h"
-#include "log/Formats.h"
 
-class ACLList;
-class Logfile;
-namespace Format {
-class Format;
-}
+#ifndef SQUID_CUSTOMLOG_H_
+#define SQUID_CUSTOMLOG_H_
 
-/// representaiton of a custom log directive. Currently a POD.
-class CustomLog
+#include "log/FormattedLog.h"
+
+// TODO: Replace with std::list<FormattedLog> or its wrapper.
+/// all same-directive transaction logging rules
+/// (e.g., all access_log rules or all icap_log rules)
+class CustomLog: public FormattedLog
 {
 public:
-    char *filename;
-    ACLList *aclList;
-    Format::Format *logFormat;
-    Logfile *logfile;
-    CustomLog *next;
-    Log::Format::log_type type;
+    /// next _log line (if any); maintained by cache_cf.cc
+    CustomLog *next = nullptr;
 };
 
 #endif /* SQUID_CUSTOMLOG_H_ */
+