extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-01-14 17:48:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup of progress messages

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-07-24 09:13:46 -07:00
parent f2c9647579
commit ac5a6f4471
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1402,7 +1402,7 @@ sub copy_rules( $$;$ ) {
push @$rules2, @rules1; push @$rules2, @rules1;
progress_message " $count rules from $chain1->{name} appended to $chain2->{name}"; progress_message " $count rules from $chain1->{name} appended to $chain2->{name}" if $count;
unless ( --$chain1->{references}{$name2} ) { unless ( --$chain1->{references}{$name2} ) {
delete $chain1->{references}{$name2}; delete $chain1->{references}{$name2};
@ -2489,7 +2489,7 @@ sub optimize_level4( $$ ) {
# If the chain isn't branched to, then delete it # If the chain isn't branched to, then delete it
# #
unless ( $chainref->{dont_delete} || keys %{$chainref->{references}} ) { unless ( $chainref->{dont_delete} || keys %{$chainref->{references}} ) {
delete_chain $chainref; delete_chain $chainref if $chainref->{referenced};
next; next;
} }
@ -2638,6 +2638,7 @@ sub optimize_level8( $$$ ) {
next unless @{$chainref1->{rules}}; next unless @{$chainref1->{rules}};
next if $chainref1->{dont_delete}; next if $chainref1->{dont_delete};
if ( $chainref->{digest} eq $chainref1->{digest} ) { if ( $chainref->{digest} eq $chainref1->{digest} ) {
progress_message " Chain $chainref1->{name} combined with $chainref->{name}";
replace_references $chainref1, $chainref->{name}, undef; replace_references $chainref1, $chainref->{name}, undef;
$renamed{ $chainref->{name} } = 1 unless $chainref->{name} =~ /^~/; $renamed{ $chainref->{name} } = 1 unless $chainref->{name} =~ /^~/;
} }