extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-19 21:01:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove some whitespace

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-06-25 21:55:49 -07:00
parent 9f37f09b28
commit 7507c81882
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Shorewall/Perl/Shorewall/Config.pm
View File

@ -1856,10 +1856,9 @@ sub set_action_param( $$ ) {
# #
sub expand_variables( \$ ) { sub expand_variables( \$ ) {
my ( $line, $count ) = ( $_[0], 0 ); my ( $line, $count ) = ( $_[0], 0 );
# $1 $2 $3 - $4 # $1 $2 $3 - $4
while ( $$line =~ m( ^(.*?) \$({)? (\w+) (?(2)}) (.*)$ )x ) { while ( $$line =~ m( ^(.*?) \$({)? (\w+) (?(2)}) (.*)$ )x ) {
my ( $first, $var, $rest ) = ( $1, $3, $4); my ( $first, $var, $rest ) = ( $1, $3, $4);
my $val; my $val;
@ -1871,7 +1870,7 @@ sub expand_variables( \$ ) {
fatal_error "Undefined shell variable (\$$var)" unless exists $params{$var}; fatal_error "Undefined shell variable (\$$var)" unless exists $params{$var};
$val = $params{$var}; $val = $params{$var};
} }
$val = '' unless defined $val; $val = '' unless defined $val;
$$line = join( '', $first , $val , $rest ); $$line = join( '', $first , $val , $rest );
fatal_error "Variable Expansion Loop" if ++$count > 100; fatal_error "Variable Expansion Loop" if ++$count > 100;
@ -1955,7 +1954,7 @@ sub read_a_line(;$$) {
# Expand Shell Variables using %params and @actparms # Expand Shell Variables using %params and @actparms
# #
expand_variables( $currentline ) if $expand_variables; expand_variables( $currentline ) if $expand_variables;
if ( $currentline =~ /^\s*INCLUDE\s/ ) { if ( $currentline =~ /^\s*INCLUDE\s/ ) {
my @line = split ' ', $currentline; my @line = split ' ', $currentline;