Improved error message, fix typos (#387)

* Add location to error message. * Update default version ID * fix spelling Signed-off-by: Henry Cox <[email protected]>
linux-test-project · Jan 23, 2025 · b1a5332 · b1a5332
1 parent 12dc677
commit b1a5332
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/bin/get_version.sh b/bin/get_version.sh
@@ -25,7 +25,7 @@ else
 fi
 
 # Fallback
-[ -z "$VERSION" ] && VERSION="2.3"
+[ -z "$VERSION" ] && VERSION="2.4"
 [ -z "$RELEASE" ] && RELEASE="beta"
 [ -z "$FULL" ]    && FULL="$VERSION-$RELEASE"
 

diff --git a/lib/lcovutil.pm b/lib/lcovutil.pm
@@ -4676,9 +4676,10 @@ sub define_function
         $location = '"' . $self->filename() . '":' . $start_line
             unless defined($location);
         lcovutil::ignorable_error($lcovutil::ERROR_INCONSISTENT_DATA,
-            "$location: duplicate function '$fnName' starts on line $start_line but previous definition started on "
-                . $data->line()
-                . MessageContext::context() . '.')
+                   "$location: duplicate function '$fnName' starts on line \"" .
+                       $data->filename() .
+                       "\":$start_line but previous definition started on " .
+                       $data->line() . MessageContext::context() . '.')
             unless
             grep({ $fnName =~ $_ } @lcovutil::suppress_function_patterns);
         # if ignored, just return the function we already have -

diff --git a/man/genhtml.1 b/man/genhtml.1
@@ -1022,7 +1022,7 @@ table entry to the first line in the corresponding file in the particular
 category - e.g., to the first 'MIS' line (vanilla coverage report - see the
 .i \-\-show\-navigation
 option, below), to
-the first 'UNC' branch (differential coverage repot), etc.
+the first 'UNC' branch (differential coverage report), etc.
 Hyperlinks from the summary table at the top of the 'source detail' page are not affected.
 
 .RE

diff --git a/rpm/lcov.spec b/rpm/lcov.spec
@@ -1,6 +1,6 @@
 Summary: A graphical code coverage front-end
 Name: lcov
-Version: 2.3
+Version: 2.4
 Release: 1
 License: GPLv2+
 Group: Development/Tools

diff --git a/tests/lcov/extract/extract.sh b/tests/lcov/extract/extract.sh
@@ -429,7 +429,7 @@ if [ 0 != $? ] ; then
 fi
 
 
-# workaround:  depending on compiler verision, we see a coverpoint on the
+# workaround:  depending on compiler version, we see a coverpoint on the
 #  close brace line (gcc/6 for example) or we don't (gcc/10 for example)
 BRACE_LINE='^DA:34'
 MARKER_LINES=`grep -v $BRACE_LINE internal.info | grep -c "^DA:"`