From: The Squid Software Foundation <>
Date: Fri, 4 Oct 2013 03:43:12 +0000 (-0600)
Subject: Do not preserve empty DEBUGs.
X-Git-Tag: SQUID_3_5_0_1~98^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6869c265d6256e2617f19e501c8792c9348e5748;p=thirdparty%2Fsquid.git

Do not preserve empty DEBUGs.
---

diff --git a/scripts/boiler-mgr.pl b/scripts/boiler-mgr.pl
index 8dc1e0f989..ef840b0e62 100755
--- a/scripts/boiler-mgr.pl
+++ b/scripts/boiler-mgr.pl
@@ -28,11 +28,16 @@ my $reComment = qr{
 	/\*.*?\*/
 }xs;
 
-# Debugging section inside a boilerplate comment
+# Debugging section inside a boilerplate comment.
 my $reDebug = qr{
 	^[\s*]*(DEBUG:.*?)$
 }mx;
 
+# Same as $reDebug, but does not match empty DEBUG: statements.
+my $reDebugFull = qr{
+	^[\s*]*(DEBUG:[^\S\n]*\S.*?)\s*$
+}mx;
+
 # Copyright-related claims inside a boilerplate comment
 my $reClaims = qr{
 	(
@@ -122,7 +127,7 @@ foreach my $fname (@FileNames) {
 	my $extras = ''; # DEBUG section, inspired by ..., etc.
 
 	if (defined $boiler) {
-		if ($boiler =~ m/$reDebug/) {
+		if ($boiler =~ m/$reDebugFull/) {
 			$extras .= "/* $1 */\n\n";
 		}