From d0f68b35271e5511187dfc8aad03dfd9f646001a Mon Sep 17 00:00:00 2001
From: Henry Cox <henry.cox@mediatek.com>
Date: Thu, 31 Jul 2025 11:00:41 -0400
Subject: [PATCH 1/2] Somewhat simpler code/easier to read.

Signed-off-by:  Henry Cox <henry.cox@mediatek.com>
---
 lib/lcovutil.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/lcovutil.pm b/lib/lcovutil.pm
index bdf9c9a..5dffcac 100644
--- a/lib/lcovutil.pm
+++ b/lib/lcovutil.pm
@@ -2102,14 +2102,14 @@ sub update_state
     while (my ($f, $v) = each(%$updateVersionCache)) {
         lcovutil::ignorable_error($lcovutil::ERROR_INTERNAL,
                                   "unexpected version entry")
-            if exists($versionCache{$f}) && !($versionCache{$f} eq $v);
+            if exists($versionCache{$f}) && $versionCache{$f} ne $v;
         $versionCache{$f} = $v;
     }
     my $updateResolveCache = shift;
     while (my ($f, $v) = each(%$updateResolveCache)) {
         lcovutil::ignorable_error($lcovutil::ERROR_INTERNAL,
                                   "unexpected resolve entry")
-            if exists($resolveCache{$f}) && !($resolveCache{$f} eq $v);
+            if exists($resolveCache{$f}) && $resolveCache{$f} ne $v;
         $resolveCache{$f} = $v;
     }
     my $msgTypes = shift;

From c8bf7501374331be4243454dd3ebb340d0f516a7 Mon Sep 17 00:00:00 2001
From: Henry Cox <henry.cox@mediatek.com>
Date: Mon, 11 Aug 2025 10:34:40 -0400
Subject: [PATCH 2/2] Attempt to clarify 'genhtml --diff-file' usage.  See
 #425.

Signed-off-by: Henry Cox <henry.cox@mediatek.com>
---
 lib/lcovutil.pm |  2 +-
 man/genhtml.1   | 25 +++++++++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/lib/lcovutil.pm b/lib/lcovutil.pm
index 5dffcac..9c44cc6 100644
--- a/lib/lcovutil.pm
+++ b/lib/lcovutil.pm
@@ -5102,7 +5102,7 @@ sub removeBranches
 
 sub _checkCounts
 {
-    # some consistenc checking
+    # some consistency checking
     my $self = shift;
 
     my $data  = $self->[BranchMap::DATA];
diff --git a/man/genhtml.1 b/man/genhtml.1
index 76912e9..ce7e1d2 100644
--- a/man/genhtml.1
+++ b/man/genhtml.1
@@ -1158,16 +1158,13 @@ callback to verify that source versions match before source-based filtering is a
 It is almost always a better idea to filter at capture or aggregate time - not at report generation.
 
 A suitable
-.I diff\-file
-can be generated using the command:
-.br
-
-.RS
-git diff \-\-relative <SHA_base> <SHA_current>
-.RE
+.I \"universal diff\"
+input file for the
+.I \-\-diff\-file
+option
+can be generated using either the "p4udiff" or "gitdiff" sample scripts that are provided as part of this package, or by using revision control commands directly.
 
-or using the "p4udiff" or "gitdiff" sample scripts that are provided as part of this package in the following locations:
-.br
+The "p4udiff" or "gitdiff" sample scripts are found in:
 
 .RS
 \*[scriptdir]/p4udiff
@@ -1181,10 +1178,18 @@ and
 .br
 .RE
 
+
+These scripts simply post\-process the 'p4' or 'git' output to (optionally) remove files that are not of interest and to explicitly note files which have not changed.
+
 .B p4udiff
 accepts either a changelist ID or the literal string "sandbox"; "sandbox" indicates that there are modified files which have not been checked in.
+See "
+.I gitdiff \-\- help
+" and "
+.I p4udiff \-\- help
+" for more information.
 
-These scripts post\-process the 'p4' or 'git' output to (optionally) remove files that are not of interest and to explicitly note files which have not changed.  It is useful to note unchanged files denoted by lines of the form:
+It is useful to note unchanged files denoted by lines of the form:
 .br
 
 .RS