Changeset 32324 for main/trunk/greenstone2/perllib/util.pm

Timestamp:

2018-08-06T20:03:35+12:00 (6 years ago)

Author:

ak19

Message:

Minor changes to util.pm before committing a bugfix.

File:

• main/trunk/greenstone2/perllib/util.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/util.pm

@@ -686 +686 @@
     while(1) {
     my ($cpackage,$cfilename,$cline,$csubr,$chas_args,$cwantarray) = caller($depth);
-    last unless defined $cfilename; # when call stack printed in full
+    last unless (defined $cfilename && defined $cline && defined $cpackage); # when call stack printed in full
     my ($lcfilename) = ($cfilename =~ m/([^\\\/]*)$/);
     print STDERR "\t$lcfilename:$cline $cpackage->$csubr\n";
@@ -693 +693 @@
     # So this method prints out maxdepth+1 callers
     last if($maxdepth && $depth > $maxdepth);
-    }    
-}
+    }
+    return "";
+}
+
 
 # returns 1 if filename1 and filename2 point to the same