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

Rename valuesort() to sortchainsiftest() and remove keysort()

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2020-04-11 13:42:41 -07:00
parent a49a9f9f9d
commit 4e83d0788e
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Shorewall/Perl/Shorewall/Chains.pm
View File

@ -3710,15 +3710,7 @@ sub optimize_level0() {
#
# Conditionally sort a list of chain table entry references by name, if -t was specified
#
sub keysort(\%) {
my $hashref = shift;
return sort { $a->{name} cmp $b->{name} } keys %$hashref if $test;
return keys %$hashref;
}
sub valuesort(\%) {
sub sortchainsiftest(\%) {
my $hashref = shift;
return sort { $a->{name} cmp $b->{name} } values %$hashref if $test;
@ -3946,7 +3938,7 @@ sub optimize_level4( $$ ) {
my @chains = grep ( $_->{referenced} &&
! $_->{optflags} &&
@{$_->{rules}} < 4 &&
keys %{$_->{references}} == 1 , valuesort %$tableref );
keys %{$_->{references}} == 1 , sortchainsiftest %$tableref );
if ( my $chains = @chains ) {
$passes++;
@ -4598,7 +4590,7 @@ sub combine_states {
sub optimize_level16( $$$ ) {
my ( $table, $tableref , $passes ) = @_;
my @chains = ( grep $_->{referenced}, valuesort %{$tableref} );
my @chains = ( grep $_->{referenced}, sortchainsiftest %{$tableref} );
my @chains1 = @chains;
my $chains = @chains;