|
From: <sv...@va...> - 2007-09-21 23:11:15
|
Author: njn
Date: 2007-09-22 00:11:15 +0100 (Sat, 22 Sep 2007)
New Revision: 6894
Log:
Handle bad input files a little better.
Modified:
branches/MASSIF2/massif/ms_print
Modified: branches/MASSIF2/massif/ms_print
===================================================================
--- branches/MASSIF2/massif/ms_print 2007-09-21 23:08:52 UTC (rev 6893)
+++ branches/MASSIF2/massif/ms_print 2007-09-21 23:11:15 UTC (rev 6894)
@@ -141,8 +141,10 @@
sub equals_num_line($$)
{
my ($line, $fieldname) = @_;
- (defined($line) and $line =~ s/^$fieldname=(.*)\s*$//) or
- die("Line $.: expected \"$fieldname\" line, got:\n$line\n");
+ defined($line)
+ or die("Line $.: expected \"$fieldname\" line, got end of file\n");
+ $line =~ s/^$fieldname=(.*)\s*$//
+ or die("Line $.: expected \"$fieldname\" line, got:\n$line");
return $1;
}
|