From 29e0f57928dee826dee85696bb383d061d7c657d Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sat, 3 Sep 2011 08:44:15 -0700 Subject: [PATCH] Cosmetic/readability changes Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Chains.pm | 2 +- Shorewall/Perl/Shorewall/Compiler.pm | 5 ++--- Shorewall/Perl/Shorewall/Providers.pm | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Chains.pm b/Shorewall/Perl/Shorewall/Chains.pm index 73ed0e999..a78d7ab23 100644 --- a/Shorewall/Perl/Shorewall/Chains.pm +++ b/Shorewall/Perl/Shorewall/Chains.pm @@ -3138,7 +3138,7 @@ sub do_imac( $ ) { } # -# Mark validatation functions +# Mark validation functions # sub verify_mark( $ ) { my $mark = $_[0]; diff --git a/Shorewall/Perl/Shorewall/Compiler.pm b/Shorewall/Perl/Shorewall/Compiler.pm index c02497d2e..cac7479a7 100644 --- a/Shorewall/Perl/Shorewall/Compiler.pm +++ b/Shorewall/Perl/Shorewall/Compiler.pm @@ -615,7 +615,6 @@ sub compiler { # shorewall.conf has been processed and the capabilities have been determined. # initialize_chain_table(1); - # # Allow user to load Perl modules # @@ -697,7 +696,7 @@ sub compiler { if ( $scriptfilename || $debug ) { emit 'return 0'; pop_indent; - emit '}'; + emit '}'; # End of setup_common_rules() } disable_script; @@ -735,7 +734,7 @@ sub compiler { if ( $scriptfilename || $debug ) { pop_indent; - emit "}\n"; + emit "}\n"; # End of setup_routing_and_traffic_shaping() } disable_script; diff --git a/Shorewall/Perl/Shorewall/Providers.pm b/Shorewall/Perl/Shorewall/Providers.pm index aa1d669ad..3f97666a7 100644 --- a/Shorewall/Perl/Shorewall/Providers.pm +++ b/Shorewall/Perl/Shorewall/Providers.pm @@ -690,7 +690,7 @@ sub add_a_provider( $$ ) { " > $undo" ); if ( $balance || $default ) { - $tbl = $fallback || $config{USE_DEFAULT_RT} ? DEFAULT_TABLE : MAIN_TABLE; + $tbl = $fallback || ( $config{USE_DEFAULT_RT} ? DEFAULT_TABLE : MAIN_TABLE ); $weight = $balance ? $balance : $default; my $via = 'via';