holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Rename action param functions

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-06-11 07:46:54 -07:00
parent 0cb98737f7
commit f278d05637
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,9 +98,9 @@ our %EXPORT_TAGS = ( internal => [ qw( create_temp_script
close_file close_file
push_open push_open
pop_open pop_open
push_params push_action_params
pop_params pop_action_params
default_params default_action_params
read_a_line read_a_line
validate_level validate_level
which which
@ -1789,7 +1789,7 @@ sub embedded_perl( $ ) {
# #
# Push/pop action params # Push/pop action params
# #
sub push_params( $ ) { sub push_action_params( $ ) {
my @params = split /,/, $_[0]; my @params = split /,/, $_[0];
my $oldparams = \%actparms; my $oldparams = \%actparms;
@ -1804,12 +1804,12 @@ sub push_params( $ ) {
$oldparams; $oldparams;
} }
sub pop_params( $ ) { sub pop_action_params( $ ) {
my $oldparms = shift; my $oldparms = shift;
%actparms = %$oldparms; %actparms = %$oldparms;
} }
sub default_params { sub default_action_params {
my $val; my $val;
for ( my $i = 1; 1; $i++ ) { for ( my $i = 1; 1; $i++ ) {

8
Shorewall/Perl/Shorewall/Rules.pm
View File

@ -1450,7 +1450,7 @@ sub process_action( $) {
push_open $actionfile; push_open $actionfile;
my $oldparms = push_params( $param ); my $oldparms = push_action_params( $param );
$active{$wholeaction}++; $active{$wholeaction}++;
push @actionstack, $wholeaction; push @actionstack, $wholeaction;
@ -1478,7 +1478,7 @@ sub process_action( $) {
} }
if ( $format == 2 && $target eq 'DEFAULTS' ) { if ( $format == 2 && $target eq 'DEFAULTS' ) {
default_params( split_list $source, 'defaults' ); default_action_params( split_list $source, 'defaults' );
next; next;
} }
@ -1507,7 +1507,7 @@ sub process_action( $) {
pop_open; pop_open;
pop_params( $oldparms ); pop_action_params( $oldparms );
} }
} }
@ -1566,7 +1566,7 @@ sub process_macro ( $$$$$$$$$$$$$$$$$ ) {
} }
if ( $format == 2 && $target eq 'DEFAULTS' ) { if ( $format == 2 && $target eq 'DEFAULTS' ) {
default_params( split_list $source, 'defaults' ); default_action_params( split_list $source, 'defaults' );
next; next;
} }