From 6771dc54ad01cbe8dce93a213c0de020047ad8cf Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Fri, 18 Jul 2014 12:58:49 -0700 Subject: [PATCH] Streamline some code from the last commit Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Tc.pm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Tc.pm b/Shorewall/Perl/Shorewall/Tc.pm index a8643446a..02e31e6e1 100644 --- a/Shorewall/Perl/Shorewall/Tc.pm +++ b/Shorewall/Perl/Shorewall/Tc.pm @@ -229,9 +229,7 @@ sub process_mangle_rule1( $$$$$$$$$$$$$$$$$$ ) { sub handle_mark_param( $$ ) { my ( $option, $marktype ) = @_; - my $and_or = $1 if $params =~ s/^([|&])//; - - $and_or ||= ''; + my $and_or = $params =~ s/^([|&])// ? $1 : ''; if ( $params =~ /-/ ) { #