[PATCH 2/7] checkpatch: correctly stop scanning at the bottom of a hunk

Andy Whitcroft
2009-10-16T18:40:06Z

We are allowing context scanning checks to apply against the first line
of context outside at the end of the hunk. This can lead to false
matches to patch names leading to various perl warnings. Correctly stop
at the bottom of the hunk.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
scripts/checkpatch.pl | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index b43e309..1eca1e1 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1234,7 +1234,6 @@ sub process {
$linenr++;

my $rawline = $rawlines[$linenr - 1];
- my $hunk_line = ($realcnt != 0);

#extract the line range in the file after the patch is applied
if ($line=~/^\@\@ -\d+(?:,\d+)? \+(\d+)(,(\d+))? \@\@/) {
@@ -1274,6 +1273,8 @@ sub process {
$realcnt--;
}

+ my $hunk_line = ($realcnt != 0);
+
#make up the handle for any error we report on this line
$prefix = "$filename:$realline: " if ($emacs && $file);
$prefix = "$filename:$linenr: " if ($emacs && !$file);
--
1.6.3.3