SourceFormat Enforcement

[thirdparty/squid.git] / scripts / boiler-mgr.pl

diff --git a/scripts/boiler-mgr.pl b/scripts/boiler-mgr.pl
index 346e6fddc7805acd0f9507b242b0885ae4856a8e..9c65deb4e73726a615aebecfeae51c6777ce0b7c 100755 (executable)
--- a/scripts/boiler-mgr.pl
+++ b/scripts/boiler-mgr.pl
@@ -1,4 +1,11 @@
 #!/usr/bin/perl -w
+#
+## Copyright (C) 1996-2017 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.
+##
 
 # Adds or adjusts the source file boilerplate, such as a Copyright statement.
 # The boilerplate is meant to remain constant from one source file to another.
@@ -69,7 +76,11 @@ my $reClaimPrefix = qr{
 
 # We have persmission to move these frequent claims to CONTRIBUTORS.
 my $reClaimsOkToMove = qr{
-       Francesco.Chemolli|<kinkie\@squid-cache.org>|
+       Robert.Collins|<robertc\@squid-cache.org>|<rbtcollins\@hotmail.com>|
+
+       Duane.Wessels|
+
+       Francesco.Chemolli|<kinkie\@squid-cache.org>|<kinkie\@kame.usr.dsi.unimi.it>|
 
        Amos.Jeffries|<amosjeffries\@squid-cache.org>|<squid3\@treenet.co.nz>|
        Treehouse.Networks.Ltd.|
@@ -77,13 +88,9 @@ my $reClaimsOkToMove = qr{
 
        Henrik.Nordstrom|<henrik\@henriknordstrom.net>|
        MARA.Systems.AB|
-}xi;
-# XXX: We have not gotten permission for some of the entries yet:
-#
-#      Robert.Collins|<robertc\@squid-cache.org>|
-#
-#      the.Regents.of.the.University.of
 
+       Guido.Serassio|<serassio\@squid-cache.org>|<guido.serassio\@acmeconsulting.it>|
+}xi;
 
 # inspirations are not copyright claims but should be preserved
 my $reInspiration = qr/^[\s*]*(inspired by previous work.*?)$/mi;
@@ -119,8 +126,8 @@ foreach my $fname (@FileNames) {
        my $code = &readFile($fname) or next;
        my $virginCode = $code;
 
-       &Warn("Correct boilerplate already present, skipping:", $code), next if
-               $code =~ /\Q$CorrectBoiler\E/s;
+       &WarnQuiet("Correct boilerplate already present, skipping:", $code), next if
+                       $code =~ /\Q$CorrectBoiler\E/s;
 
        my $boiler;
 
@@ -330,3 +337,10 @@ sub Warn() {
        $msg = sprintf("%s: WARNING: %s\n%s", $FileName, $msg, $context) if defined $FileName;
        warn($msg);
 }
+
+sub WarnQuiet() {
+       my ($msg, $context) = @_;
+
+       $msg = sprintf("%s: WARNING: %s\n", $FileName, $msg) if defined $FileName;
+       warn($msg);
+}