From 75258083e3653308f82f7e13be12855fee247e54 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Sun, 1 Dec 2013 09:24:49 -0800
Subject: [PATCH] Cleanup of column splitting change.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/Perl/Shorewall/Config.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm
index 2cc651eb0..9128de888 100644
--- a/Shorewall/Perl/Shorewall/Config.pm
+++ b/Shorewall/Perl/Shorewall/Config.pm
@@ -1982,7 +1982,7 @@ sub split_list3( $$ ) {
     @list2;
 }
 
-sub split_list4( $ ) {
+sub split_columns( $ ) {
     my ($list) = @_;
 
     return split ' ', $list unless $list =~ /\(/;
@@ -2008,7 +2008,7 @@ sub split_list4( $ ) {
 		     push @list2 , $element;
 		     $element = '';
 		} else {
-		    fatal_error "Mismatched parentheses ($list)" if $opencount < 0;
+		    fatal_error "Mismatched parentheses ($_)" if $opencount < 0;
 		}
 	    }
 	} elsif ( ( $count =  tr/)/)/ ) > 0 ) {
@@ -2017,7 +2017,7 @@ sub split_list4( $ ) {
 		 push @list2 , $element;
 		 $element = '';
 	    } else {
-		fatal_error "Mismatched parentheses ($list)" if $opencount < 0;
+		fatal_error "Mismatched parentheses ($_)" if $opencount < 0;
 	    }
 	} elsif ( $element eq '' ) {
 	    push @list2 , $_;
@@ -2096,7 +2096,7 @@ sub split_line1( $$;$$ ) {
     fatal_error "Shorewall Configuration file entries may not contain double quotes, single back quotes or backslashes" if $columns =~ /["`\\]/;
     fatal_error "Non-ASCII gunk in file" if $columns =~ /[^\s[:print:]]/;
 
-    my @line = split_list4( $columns );
+    my @line = split_columns( $columns );
 
     $nopad = {} unless $nopad;