From 8a6e2f1712b1e7758408e43501f3c9b7a5a9aac3 Mon Sep 17 00:00:00 2001 From: teastep Date: Sun, 3 Feb 2008 00:07:58 +0000 Subject: [PATCH] A little optimization in macro handling git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8136 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall-perl/Shorewall/Rules.pm | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/Shorewall-perl/Shorewall/Rules.pm b/Shorewall-perl/Shorewall/Rules.pm index a72468899..e2fe98c2f 100644 --- a/Shorewall-perl/Shorewall/Rules.pm +++ b/Shorewall-perl/Shorewall/Rules.pm @@ -883,13 +883,19 @@ sub process_macro ( $$$$$$$$$$$$$ ) { $mdest = ''; } - $mproto = merge_macro_column $mproto, $proto; - $mports = merge_macro_column $mports, $ports; - $msports = merge_macro_column $msports, $sports; - $mrate = merge_macro_column $mrate, $rate; - $muser = merge_macro_column $muser, $user; - - process_rule1 $mtarget, $msource, $mdest, $mproto, $mports, $msports, $origdest, $mrate, $muser, $mark, $wildcard; + process_rule1( + $mtarget, + $msource, + $mdest, + merge_macro_column( $mproto, $proto ) , + merge_macro_column( $mports, $ports ) , + merge_macro_column( $msports, $sports ) , + $origdest, + merge_macro_column( $mrate, $rate ) , + merge_macro_column( $muser, $user ) , + $mark, + $wildcard + ); progress_message " Rule \"$currentline\" $done"; }