From 8133c056fc338492026d19a0ba510b2ba8e461b1 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Mon, 26 Mar 2007 20:52:38 +0000
Subject: [PATCH] Change a warning message; simplify 'isolate_basic_target()'

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5705 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 New/Shorewall/Actions.pm | 4 +---
 New/Shorewall/Zones.pm   | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/New/Shorewall/Actions.pm b/New/Shorewall/Actions.pm
index 210377cd6..1bff05d92 100644
--- a/New/Shorewall/Actions.pm
+++ b/New/Shorewall/Actions.pm
@@ -113,9 +113,7 @@ sub merge_levels ($$) {
 # Get Macro Name
 #
 sub isolate_basic_target( $ ) {
-    my $result = ( split '/' , $_[0] )[0];
-
-    ( split /:/, $result )[0];
+    ( split '/', ( split /:/ , $_[0] )[0] )[0];
 }
 
 #
diff --git a/New/Shorewall/Zones.pm b/New/Shorewall/Zones.pm
index 3a0c7b46e..0ea187a6b 100644
--- a/New/Shorewall/Zones.pm
+++ b/New/Shorewall/Zones.pm
@@ -301,7 +301,7 @@ sub zone_report()
 	    }
 	}
     
-	print STDERR "      *** $zone is an EMPTY ZONE ***\n" unless $printed || $type eq 'firewall';
+	warning_message "*** $zone is an EMPTY ZONE ***" unless $printed || $type eq 'firewall';
     }
 }