Source Format Enforcement (#532)

[thirdparty/squid.git] / tools / purge / conffile.hh

diff --git a/tools/purge/conffile.hh b/tools/purge/conffile.hh
index ffb87c4e62520da9a11d1100faf406ea2cfdb543..ae51e8c86ed722d80caa252d35ae459a30ad21ba 100644 (file)
--- a/tools/purge/conffile.hh
+++ b/tools/purge/conffile.hh
@@ -1,6 +1,11 @@
-//
-// $Id$
-//
+/*
+ * Copyright (C) 1996-2020 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.
+ */
+
 // Author:  Jens-S. V?ckler <voeckler@rvs.uni-hannover.de>
 //
 // File:    conffile.hh
@@ -42,25 +47,15 @@
 #define _CONFFILE_HH
 
 #if !defined(__cplusplus)
-#if defined(__GNUC__) || defined(__GNUG__)
-#pragma interface
-#else
 #ifndef HAVE_BOOL
 #define HAVE_BOOL
 typedef int bool;
 #define false 0
 #define true  1
 #endif
-#endif
 #endif /* __cplusplus */
 
-
-#ifndef DEFAULT_SQUID_CONF
-#define DEFAULT_SQUID_CONF "/usr/local/squid/etc/squid.conf"
-#endif // DEFAULT_SQUID_CONF
-
-#include <stdio.h>      // FILE*
-#include <vector>      // minimum STL container
+#include <vector>
 
 struct CacheDir {
   enum CacheDirType { CDT_NONE, CDT_UFS, CDT_AUFS, CDT_DISKD, CDT_OTHER };
@@ -75,7 +70,7 @@ typedef std::vector<CacheDir> CacheDirVector;
 
 int
 readConfigFile( CacheDirVector& cachedir, 
-               const char* fn = DEFAULT_SQUID_CONF, 
+               const char* fn,
                FILE* debug = 0 );
   // purpose: read squid.conf file and extract cache_dir entries
   // paramtr: cachedir (OUT): vector with an entry for each cache_dir found