From 1397af57fbbb5fc4adfd3be1fb616fcba95788b9 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Wed, 9 May 2007 19:05:27 +0000
Subject: [PATCH] Issue 'Processing...' message before first call to
 'split_line()'

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6307 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-perl/Shorewall/Hosts.pm      | 4 ++--
 Shorewall-perl/Shorewall/Interfaces.pm | 6 +++---
 Shorewall-perl/Shorewall/Policy.pm     | 4 ++--
 Shorewall-perl/Shorewall/Zones.pm      | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Shorewall-perl/Shorewall/Hosts.pm b/Shorewall-perl/Shorewall/Hosts.pm
index 33462500f..d4484ae8b 100644
--- a/Shorewall-perl/Shorewall/Hosts.pm
+++ b/Shorewall-perl/Shorewall/Hosts.pm
@@ -59,13 +59,13 @@ sub validate_hosts_file()
 
     while ( read_a_line ) {
 
-	my ($zone, $hosts, $options ) = split_line 2, 3, 'hosts file';
-
 	if ( $first_entry ) {
 	    progress_message2 "$doing $fn...";
 	    $first_entry = 0;
 	}
 
+	my ($zone, $hosts, $options ) = split_line 2, 3, 'hosts file';
+
 	my $zoneref = $zones{$zone};
 	my $type    = $zoneref->{type};
 
diff --git a/Shorewall-perl/Shorewall/Interfaces.pm b/Shorewall-perl/Shorewall/Interfaces.pm
index ce858801c..4c2c51b4b 100644
--- a/Shorewall-perl/Shorewall/Interfaces.pm
+++ b/Shorewall-perl/Shorewall/Interfaces.pm
@@ -181,14 +181,14 @@ sub validate_interfaces_file()
 
     while ( read_a_line ) {
 
-	my ($zone, $interface, $networks, $options ) = split_line 2, 4, 'interfaces file';
-	my $zoneref;
-
 	if ( $first_entry ) {
 	    progress_message2 "$doing $fn...";
 	    $first_entry = 0;
 	}
 
+	my ($zone, $interface, $networks, $options ) = split_line 2, 4, 'interfaces file';
+	my $zoneref;
+
 	if ( $zone eq '-' ) {
 	    $zone = '';
 	} else {
diff --git a/Shorewall-perl/Shorewall/Policy.pm b/Shorewall-perl/Shorewall/Policy.pm
index 8d98ae3da..cb136026a 100644
--- a/Shorewall-perl/Shorewall/Policy.pm
+++ b/Shorewall-perl/Shorewall/Policy.pm
@@ -135,13 +135,13 @@ sub validate_policy()
 
     while ( read_a_line ) {
 
-	my ( $client, $server, $policy, $loglevel, $synparams ) = split_line 3, 5, 'policy file';
-
 	if ( $first_entry ) {
 	    progress_message2 "$doing $fn...";
 	    $first_entry = 0;
 	}
 
+	my ( $client, $server, $policy, $loglevel, $synparams ) = split_line 3, 5, 'policy file';
+
 	$loglevel  = '' if $loglevel  eq '-';
 	$synparams = '' if $synparams eq '-';
 
diff --git a/Shorewall-perl/Shorewall/Zones.pm b/Shorewall-perl/Shorewall/Zones.pm
index 949507e19..47d0d6a2f 100644
--- a/Shorewall-perl/Shorewall/Zones.pm
+++ b/Shorewall-perl/Shorewall/Zones.pm
@@ -195,15 +195,15 @@ sub determine_zones()
 
     while ( read_a_line ) {
 
-	my @parents;
-
-	my ($zone, $type, $options, $in_options, $out_options ) = split_line 1, 5, 'zones file';
-
 	if ( $first_entry ) {
 	    progress_message2 "$doing $fn...";
 	    $first_entry = 0;
 	}
 
+	my @parents;
+
+	my ($zone, $type, $options, $in_options, $out_options ) = split_line 1, 5, 'zones file';
+
 	if ( $zone =~ /(\w+):([\w,]+)/ ) {
 	    $zone = $1;
 	    @parents = split ',', $2;