summaryrefslogtreecommitdiff
path: root/lib/Carp
diff options
context:
space:
mode:
authorSteve Hay <SteveHay@planit.com>2004-05-25 17:05:02 +0100
committerRafael Garcia-Suarez <rgarciasuarez@gmail.com>2004-05-31 09:52:05 +0000
commit59b0a8b7fe6b66a1488f6943ad58e73704f876b0 (patch)
treef06912bb1f79f36f835ed2880a1a2be0f7205ccd /lib/Carp
parente509e6934ce7cafd6c279046164b9b6255429d8a (diff)
downloadperl-59b0a8b7fe6b66a1488f6943ad58e73704f876b0.tar.gz
Fix anomalies in Carp functions
Message-ID: <40B3609E.5060502@uk.radan.com> p4raw-id: //depot/perl@22876
Diffstat (limited to 'lib/Carp')
-rw-r--r--lib/Carp/Heavy.pm10
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/Carp/Heavy.pm b/lib/Carp/Heavy.pm
index 49e10f2679..fe7fec4585 100644
--- a/lib/Carp/Heavy.pm
+++ b/lib/Carp/Heavy.pm
@@ -138,13 +138,8 @@ sub ret_backtrace {
$tid_msg = " thread $tid" if $tid;
}
- { if ($err =~ /\n$/) { # extra block to localise $1 etc
- $mess = $err;
- }
- else {
- my %i = caller_info($i);
- $mess = "$err at $i{file} line $i{line}$tid_msg\n";
- }}
+ my %i = caller_info($i);
+ $mess = "$err at $i{file} line $i{line}$tid_msg\n";
while (my %i = caller_info(++$i)) {
$mess .= "\t$i{sub_name} called at $i{file} line $i{line}$tid_msg\n";
@@ -155,7 +150,6 @@ sub ret_backtrace {
sub ret_summary {
my ($i, @error) = @_;
- my $mess;
my $err = join '', @error;
$i++;