Source Format Enforcement (#763)

[thirdparty/squid.git] / src / RemovalPolicy.h

diff --git a/src/RemovalPolicy.h b/src/RemovalPolicy.h
index dcd83cd888c0492a74029d18322cba1e51feea2c..01d0e30e807019490aa87a51ff87ab3ab58d0512 100644 (file)
--- a/src/RemovalPolicy.h
+++ b/src/RemovalPolicy.h
@@ -1,33 +1,9 @@
-
 /*
+ * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
  *
- * 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) 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.
  */
 
 #ifndef   SQUID_REMOVALPOLICY_H
@@ -37,6 +13,8 @@
 
 class RemovalPolicyWalker;
 class RemovalPurgeWalker;
+class wordlist;
+class StoreEntry;
 
 class RemovalPolicySettings
 {
@@ -59,6 +37,8 @@ public:
 
 class RemovalPolicy
 {
+    CBDATA_CLASS(RemovalPolicy);
+
 public:
     const char *_type;
     void *_data;
@@ -70,31 +50,29 @@ public:
     RemovalPolicyWalker *(*WalkInit) (RemovalPolicy * policy);
     RemovalPurgeWalker *(*PurgeInit) (RemovalPolicy * policy, int max_scan);
     void (*Stats) (RemovalPolicy * policy, StoreEntry * entry);
-private:
-    CBDATA_CLASS2(RemovalPolicy);
 };
 
 class RemovalPolicyWalker
 {
+    CBDATA_CLASS(RemovalPolicyWalker);
+
 public:
     RemovalPolicy *_policy;
     void *_data;
     const StoreEntry *(*Next) (RemovalPolicyWalker * walker);
     void (*Done) (RemovalPolicyWalker * walker);
-private:
-    CBDATA_CLASS2(RemovalPolicyWalker);
 };
 
 class RemovalPurgeWalker
 {
+    CBDATA_CLASS(RemovalPurgeWalker);
+
 public:
     RemovalPolicy *_policy;
     void *_data;
     int scanned, max_scan, locked;
     StoreEntry *(*Next) (RemovalPurgeWalker * walker);
     void (*Done) (RemovalPurgeWalker * walker);
-private:
-    CBDATA_CLASS2(RemovalPurgeWalker);
 };
 
 RemovalPolicy *createRemovalPolicy(RemovalPolicySettings * settings);
@@ -102,3 +80,4 @@ RemovalPolicy *createRemovalPolicy(RemovalPolicySettings * settings);
 typedef RemovalPolicy *REMOVALPOLICYCREATE(wordlist * args);
 
 #endif /* SQUID_REMOVALPOLICY_H */
+