From 9638033e24fbe701a215755e843fbd049dc0af1d Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Mon, 31 Aug 2015 11:33:32 -0700
Subject: [PATCH] Cosmetic changes to first_entry() calls

Signed-off-by: Tom Eastep <teastep@shorewall.net>

Conflicts:
	Shorewall/Perl/Shorewall/Tc.pm
---
 Shorewall/Perl/Shorewall/Tc.pm | 45 ++++++++++++++++------------------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/Shorewall/Perl/Shorewall/Tc.pm b/Shorewall/Perl/Shorewall/Tc.pm
index d3ae9285c..3d6df47d3 100644
--- a/Shorewall/Perl/Shorewall/Tc.pm
+++ b/Shorewall/Perl/Shorewall/Tc.pm
@@ -3155,15 +3155,16 @@ sub convert_tos($$) {
     }
 
     if ( my $fn = open_file 'tos' ) {
-	first_entry
-	    sub {
-		my $date = localtime;
-		progress_message2 "Converting $fn...";
-		print( $mangle
-		       "#\n" ,
-		       "# Rules generated from tos file $fn by Shorewall $globals{VERSION} - $date\n" ,
-		       "#\n" );
-	    };
+	first_entry(
+		    sub {
+			my $date = localtime;
+			progress_message2 "Converting $fn...";
+			print( $mangle
+			       "#\n" ,
+			       "# Rules generated from tos file $fn by Shorewall $globals{VERSION} - $date\n" ,
+			       "#\n" );
+		    }
+		   );
 
 	while ( read_a_line( NORMAL_READ ) ) {
 
@@ -3320,20 +3321,16 @@ sub setup_tc( $ ) {
 
 		directive_callback( sub () { print $mangle "$_[1]\n" unless $_[0] eq 'FORMAT'; 0; } );
 
-
-		first_entry
-		    sub {
-			if ( $convert ) {
-			    my $date = localtime;
-			    progress_message2 "Converting $fn...";
-			    print( $mangle
-				   "#\n" ,
-				   "# Rules generated from tcrules file $fn by Shorewall $globals{VERSION} - $date\n" ,
-				   "#\n" );
-			} else {
-			    progress_message2 "$doing $fn...";
-			}
-		    };
+		first_entry(
+			    sub {
+				my $date = localtime;
+				progress_message2 "Converting $fn...";
+				print( $mangle
+				       "#\n" ,
+				       "# Rules generated from tcrules file $fn by Shorewall $globals{VERSION} - $date\n" ,
+				       "#\n" );
+			    }
+			   );
 
 		process_tc_rule, $have_tcrules++ while read_a_line( NORMAL_READ );
 
@@ -3370,7 +3367,7 @@ sub setup_tc( $ ) {
 		    #
 		    # We are going to convert this tosfile to the equivalent mangle file
 		    #
-		    ( $mangle, my $fn1 ) = open_mangle_for_output;
+		    ( $mangle, $fn1 ) = open_mangle_for_output;
 		    convert_tos( $mangle, $fn1 );
 		    close $mangle;
 		}