extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-24 11:41:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Correct file/line from ?error

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2017-03-06 11:02:06 -08:00
parent 71d9a03697
commit dc53fa2665
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3000,8 +3000,8 @@ sub process_compiler_directive( $$$$ ) {
$filename , $filename ,
$linenumber , $linenumber ,
1 ) , 1 ) ,
$actparams{callfile} , $filename ,
$actparams{callline} ) unless $omitting; $linenumber ) unless $omitting;
} }
} , } ,
@ -3012,8 +3012,8 @@ sub process_compiler_directive( $$$$ ) {
$filename , $filename ,
$linenumber , $linenumber ,
1 ), 1 ),
$actparams{callfile} , $filename ,
$actparams{callline} ) unless $omitting; $linenumber ) unless $omitting;
} }
} , } ,
@ -3024,8 +3024,8 @@ sub process_compiler_directive( $$$$ ) {
$filename , $filename ,
$linenumber , $linenumber ,
1 ), 1 ),
$actparams{callfile} , $filename ,
$actparams{callline} ) unless $omitting; $linenumber ) unless $omitting;
} }
} , } ,
@ -3036,8 +3036,8 @@ sub process_compiler_directive( $$$$ ) {
$filename , $filename ,
$linenumber , $linenumber ,
1 ), 1 ),
$actparams{callfile} , $filename ,
$actparams{callline} ) unless $omitting; $linenumber ) unless $omitting;
} }
} , } ,
@ -3048,8 +3048,8 @@ sub process_compiler_directive( $$$$ ) {
$filename , $filename ,
$linenumber , $linenumber ,
1 ), 1 ),
$actparams{callfile} , $filename ,
$actparams{callline} ) unless $omitting; $linenumber ) unless $omitting;
} }
} , } ,
@ -3560,8 +3560,6 @@ sub push_action_params( $$$$$$ ) {
$actparams{logtag} = $logtag; $actparams{logtag} = $logtag;
$actparams{caller} = $caller; $actparams{caller} = $caller;
$actparams{disposition} = '' if $chainref->{action}; $actparams{disposition} = '' if $chainref->{action};
$actparams{callfile} = $currentfilename;
$actparams{callline} = $currentlinenumber;
# #
# The Shorewall variable '@chain' has non-word characters other than hyphen removed # The Shorewall variable '@chain' has non-word characters other than hyphen removed
# #
@ -3773,6 +3771,8 @@ sub read_a_line($) {
while ( <$currentfile> ) { while ( <$currentfile> ) {
chomp; chomp;
$currentlinenumber = $. unless $currentlinenumber;
# #
# Handle directives # Handle directives
# #
@ -3786,8 +3786,6 @@ sub read_a_line($) {
$directive_callback->( 'OMITTED', $_ ) if ( $directive_callback ); $directive_callback->( 'OMITTED', $_ ) if ( $directive_callback );
next; next;
} }
$currentlinenumber = $. unless $currentlinenumber;
# #
# Suppress leading whitespace in certain continuation lines # Suppress leading whitespace in certain continuation lines
# #