Autouse the Carp module

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6804 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-07-08 14:44:01 +00:00
parent 4574fa075b
commit ce6ebfdc0a

View File

@ -31,6 +31,7 @@ use strict;
use warnings; use warnings;
use Shorewall::Common; use Shorewall::Common;
use File::Basename; use File::Basename;
use autouse 'Carp' => qw(longmess confess);
our @ISA = qw(Exporter); our @ISA = qw(Exporter);
our @EXPORT = qw( our @EXPORT = qw(
@ -327,7 +328,7 @@ sub warning_message
my $currentlineinfo = $currentfile ? " : $currentfilename (line $currentlinenumber)" : ''; my $currentlineinfo = $currentfile ? " : $currentfilename (line $currentlinenumber)" : '';
if ( $debug ) { if ( $debug ) {
print STDERR Carp::longmess( " WARNING: @_$currentlineinfo" ); print STDERR longmess( " WARNING: @_$currentlineinfo" );
} else { } else {
print STDERR " WARNING: @_$currentlineinfo\n"; print STDERR " WARNING: @_$currentlineinfo\n";
} }
@ -338,7 +339,7 @@ sub warning_message
# #
sub fatal_error { sub fatal_error {
my $currentlineinfo = $currentfile ? " : $currentfilename (line $currentlinenumber)" : ''; my $currentlineinfo = $currentfile ? " : $currentfilename (line $currentlinenumber)" : '';
Carp::confess " ERROR: @_$currentlineinfo" if $debug; confess " ERROR: @_$currentlineinfo" if $debug;
die " ERROR: @_$currentlineinfo\n"; die " ERROR: @_$currentlineinfo\n";
} }
@ -353,7 +354,6 @@ sub set_config_path( $ ) {
# Set $debug # Set $debug
# #
sub set_debug( $ ) { sub set_debug( $ ) {
use Carp;
$debug = shift; $debug = shift;
} }