From fb2d87668347544a39891335028d493dee2891c8 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Tue, 4 Dec 2012 08:49:59 -0800 Subject: [PATCH] Rename $loglevel and $logtag to $_loglevel and $_logtag respectively. Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Config.pm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index 62f1ac9d2..26d49bdde 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -1930,12 +1930,11 @@ sub evaluate_expression( $$$ ) { my $val; my $count = 0; - # $1 $2 $3 - $4 - while ( $expression =~ m( ^(.*?) \$({)? (\d+|[a-zA-Z]\w*) (?(2)}) (.*)$ )x ) { + # $1 $2 $3 - $4 + while ( $expression =~ m( ^(.*?) \$({)? (\d+|[a-zA-Z_]\w*) (?(2)}) (.*)$ )x ) { my ( $first, $var, $rest ) = ( $1, $3, $4); $val = ( exists $variables{$var} ? $variables{$var} : - $val = ( exists $symbols{$var} ? $symbols{$var} : exists $actparms{$var} ? ( $var ? $actparms{$var} : $actparms{0}->{name} ) : exists $capdesc{$var} ? have_capability( $var ) : 0 ); $val = 0 unless defined $val; @@ -2488,9 +2487,9 @@ sub push_action_params( $$$$ ) { $actparms{$i} = $val eq '-' ? '' : $val eq '--' ? '-' : $val; } - $actparms{0} = $_[0]; - $actparms{loglevel} = $_[2]; - $actparms{logtag} = $_[3]; + $actparms{0} = $_[0]; + $actparms{_loglevel} = $_[2]; + $actparms{_logtag} = $_[3]; \%oldparams; } @@ -2544,8 +2543,8 @@ sub set_action_param( $$ ) { # sub expand_variables( \$ ) { my ( $lineref, $count ) = ( $_[0], 0 ); - # $1 $2 $3 - $4 - while ( $$lineref =~ m( ^(.*?) \$({)? (\d+|[a-zA-Z]\w*) (?(2)}) (.*)$ )x ) { + # $1 $2 $3 - $4 + while ( $$lineref =~ m( ^(.*?) \$({)? (\d+|[a-zA-Z_]\w*) (?(2)}) (.*)$ )x ) { my ( $first, $var, $rest ) = ( $1, $3, $4);