Better category for DB format error messages.

Signed-off-by: Henry Cox <[email protected]>

Author: henry2cox

bin/geninfo

@@ -2592,7 +2592,7 @@ sub intermediate_json_to_info($)
                 if (!defined($line) || !defined($count));
 
             if ($line <= 0) {
-                lcovutil::ignorable_error($lcovutil::ERROR_INCONSISTENT_DATA,
+                lcovutil::ignorable_error($lcovutil::ERROR_FORMAT,
                          '"' . $fileData->filename() .
                              "\"::  unexpected line number '$line' in gcov record"
                 );

lib/lcovutil.pm

@@ -8362,8 +8362,7 @@ sub _read_info
             /^DA:(\d+),([^,]+)(,([^,\s]+))?/ && do {
                 my ($line, $count, $checksum) = ($1, $2, $4);
                 if ($line <= 0) {
-                    lcovutil::ignorable_error(
-                        $lcovutil::ERROR_INCONSISTENT_DATA,
+                    lcovutil::ignorable_error($lcovutil::ERROR_FORMAT,
                         "\"$tracefile\":$.: unexpected line number '$line' in .info file record '$_'"
                     );
                     last;
@@ -8427,12 +8426,10 @@ sub _read_info
                 my $end_line = $3;
                 if ($lineNo <= 0 ||
                     (defined($end_line) && $end_line <= 0)) {
-                    lcovutil::ignorable_error(
-                        $lcovutil::ERROR_INCONSISTENT_DATA,
+                    lcovutil::ignorable_error($lcovutil::ERROR_FORMAT,
                         "\"$tracefile\":$.: unexpected function line '$lineNo' in .info file record '$_'"
                     ) if $lineNo <= 0;
-                    lcovutil::ignorable_error(
-                        $lcovutil::ERROR_INCONSISTENT_DATA,
+                    lcovutil::ignorable_error($lcovutil::ERROR_FORMAT,
                         "\"$tracefile\":$.: unexpected function end line '$end_line' in .info file record '$_'"
                     ) if defined($end_line) && $end_line <= 0;
 
@@ -8505,8 +8502,7 @@ sub _read_info
                     #   - if we wrote one from geninfo, then we will not have
                     #     produced bogus data - so no need to check.
                     #   - only some (broken) external tool could have the issue
-                    lcovutil::ignorable_error(
-                        $lcovutil::ERROR_INCONSISTENT_DATA,
+                    lcovutil::ignorable_error($lcovutil::ERROR_FORMAT,
                         "\"$tracefile\":$.: unexpected line number '$line' in .info file record '$_'"
                     );
                     last;
@@ -8562,8 +8558,7 @@ sub _read_info
                 my ($line, $groupSize, $sense, $count, $idx, $expr) =
                     ($1, $2, $3, $4, $5, $6);
                 if ($line <= 0) {
-                    lcovutil::ignorable_error(
-                        $lcovutil::ERROR_INCONSISTENT_DATA,
+                    lcovutil::ignorable_error($lcovutil::ERROR_FORMAT,
                         "\"$tracefile\":$.: unexpected line number '$line' in condition data record record '$_'"
                     );
                     last;
@@ -8754,8 +8749,7 @@ sub write_info($$$)
 
                     if ($line <= 0) {
                         my $alias = (sort keys %$aliases)[0];
-                        lcovutil::ignorable_error(
-                            $lcovutil::ERROR_INCONSISTENT_DATA,
+                        lcovutil::ignorable_error($lcovutil::ERROR_FORMAT,
                             "\"$source_file\": unexpected line number '$line' for function $alias"
                         );
                         next;
@@ -8790,8 +8784,7 @@ sub write_info($$$)
                 foreach my $line (sort({ $a <=> $b } $testbrcount->keylist())) {
 
                     if ($line <= 0) {
-                        lcovutil::ignorable_error(
-                            $lcovutil::ERROR_INCONSISTENT_DATA,
+                        lcovutil::ignorable_error($lcovutil::ERROR_FORMAT,
                             "\"$source_file\": unexpected line number '$line' in branch data record record '$_'"
                         );
                         last;

man/genhtml.1

@@ -2873,7 +2873,9 @@ If you see continued errors, either turn off or reduce parallelism, set a memory
 .PP
 
 .IP format: 3
-Unexpected syntax found in .info file.
+Unexpected syntax or value found in .info file - for example, negative number or
+zero line number encountered.
+
 .PP
 
 .IP inconsistent: 3
@@ -2930,11 +2932,7 @@ function alias record (
 .PP
 .IP \- 3
 branch expression (3rd field in the .info file 'BRDA' entry) of merge data does not match
-.PP
 
-.PP
-.IP \- 3
-Negative number or zero line number encounted.
 .br
 If the error is ignored, the offending record is skipped.
 .RE

man/geninfo.1

@@ -902,7 +902,8 @@ If you see continued errors, either turn off or reduce parallelism, set a memory
 .PP
 
 .IP format: 3
-unexpected syntax found in .info file.
+Unexpected syntax or value found in .info file - for example, negative number or
+zero line number encountered.
 .PP
 
 .IP gcov: 3

man/lcov.1

@@ -1317,7 +1317,8 @@ If you see continued errors, either turn off or reduce parallelism, set a memory
 .PP
 
 .IP format: 3
-unexpected syntax found in .info file.
+Unexpected syntax or value found in .info file - for example, negative number or
+zero line number encountered.
 .PP
 
 .IP gcov: 3

tests/lcov/errs/errs.sh

@@ -136,7 +136,7 @@ for f in badFncLine badFncEndLine fncMismatch badBranchLine badLine ; do
     fi
 
     echo lcov $LCOV_OPTS --summary $f.info --ignore inconsistent
-    $COVER $LCOV_TOOL $LCOV_OPTS --summary $f.info --ignore inconsistent 2>&1 | tee ${f}2.log
+    $COVER $LCOV_TOOL $LCOV_OPTS --summary $f.info --ignore format,inconsistent 2>&1 | tee ${f}2.log
     if [ 0 != ${PIPESTATUS[0]} ] ; then
         echo "failed to ignore message ${f}2.log"
         status=1