SourceFormat Enforcement

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

diff --git a/tools/purge/conffile.cc b/tools/purge/conffile.cc
index 8a17e7a9e758627c21356a72ec272af8ab92d6f9..84cfb4cc93ee60be0f698ba58a9e57402b223365 100644 (file)
--- a/tools/purge/conffile.cc
+++ b/tools/purge/conffile.cc
@@ -1,4 +1,10 @@
-#include "squid.h"
+/*
+ * Copyright (C) 1996-2015 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>
 //
@@ -33,19 +39,16 @@
 // Revision 1.1  2000/09/21 09:44:53  voeckler
 // Initial revision
 //
-//
-#if (defined(__GNUC__) || defined(__GNUG__)) && !defined(__clang__)
-#pragma implementation
-#endif
 
+#include "squid.h"
 #include "conffile.hh"
+
+#include <cerrno>
+#include <cstdlib>
+#include <cstring>
+#include <fstream>
 #include <sys/types.h>
-#include <errno.h>
 #include <memory.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <fstream>
 
 int
 readConfigFile( CacheDirVector& cachedir, const char* fn, FILE* debug )
@@ -143,7 +146,7 @@ readConfigFile( CacheDirVector& cachedir, const char* fn, FILE* debug )
                                       (int)subs[offset].rm_so,
                                       (int)subs[offset].rm_eo,
                                       line+subs[offset].rm_so );
-            cd.base = strdup( line+subs[offset].rm_so );
+            cd.base = xstrdup( line+subs[offset].rm_so );
             ++offset;
 
             // extract size information
@@ -181,3 +184,4 @@ readConfigFile( CacheDirVector& cachedir, const char* fn, FILE* debug )
     regfree(&rexp);
     return cachedir.size();
 }
+