From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Thu, 3 Oct 2013 00:17:12 +0000 (-0600)
Subject: Adjusted unusual boilerplates to allow scripts/source-mangler.pl to update them
X-Git-Tag: SQUID_3_5_0_1~98^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=834a6a7de59af1cd6a0c94adfab226159a7b53e3;p=thirdparty%2Fsquid.git

Adjusted unusual boilerplates to allow scripts/source-mangler.pl to update them
automatically.

The script tries to be extra careful and skips what it feels may be a custom
boilerplate that requires a manual intervention. The cases handled by this
commit are simple, non-controversial ones.
---

diff --git a/src/HttpHeaderStat.h b/src/HttpHeaderStat.h
index ef3d616b7c..d0ca655e8e 100644
--- a/src/HttpHeaderStat.h
+++ b/src/HttpHeaderStat.h
@@ -1,6 +1,4 @@
 /*
- * HttpHeaderStat.h
- *
  *  Created on: Dec 9, 2011
  *      Author: kinkie
  */
diff --git a/src/acl/AclAddress.h b/src/acl/AclAddress.h
index ead7b36e4c..73063b4374 100644
--- a/src/acl/AclAddress.h
+++ b/src/acl/AclAddress.h
@@ -1,6 +1,3 @@
-#ifndef ACLADDRESS_H_
-#define ACLADDRESS_H_
-#include "Acl.h"
 /*
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------
@@ -29,6 +26,9 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
  */
 
+#ifndef ACLADDRESS_H_
+#define ACLADDRESS_H_
+#include "Acl.h"
 #include "ip/Address.h"
 #include "acl/Acl.h"
 
diff --git a/src/format/ByteCode.h b/src/format/ByteCode.h
index 81e33a836f..32870c77ac 100644
--- a/src/format/ByteCode.h
+++ b/src/format/ByteCode.h
@@ -1,3 +1,31 @@
+/*
+ * 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.
+ */
+
 #ifndef _SQUID_FMT_BYTECODE_H
 #define _SQUID_FMT_BYTECODE_H
 
diff --git a/src/ssl/gadgets.h b/src/ssl/gadgets.h
index e90ca6a0f5..6f007418c2 100644
--- a/src/ssl/gadgets.h
+++ b/src/ssl/gadgets.h
@@ -1,7 +1,3 @@
-/*
- * 2009/01/17
- */
-
 #ifndef SQUID_SSL_GADGETS_H
 #define SQUID_SSL_GADGETS_H