Commit cc77cdca authored by Andy Whitcroft's avatar Andy Whitcroft Committed by Linus Torvalds

checkpatch: correctly stop scanning at the bottom of a hunk

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: default avatarAndy Whitcroft <apw@canonical.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9a974fdb
...@@ -1234,7 +1234,6 @@ sub process { ...@@ -1234,7 +1234,6 @@ sub process {
$linenr++; $linenr++;
my $rawline = $rawlines[$linenr - 1]; my $rawline = $rawlines[$linenr - 1];
my $hunk_line = ($realcnt != 0);
#extract the line range in the file after the patch is applied #extract the line range in the file after the patch is applied
if ($line=~/^\@\@ -\d+(?:,\d+)? \+(\d+)(,(\d+))? \@\@/) { if ($line=~/^\@\@ -\d+(?:,\d+)? \+(\d+)(,(\d+))? \@\@/) {
...@@ -1274,6 +1273,8 @@ sub process { ...@@ -1274,6 +1273,8 @@ sub process {
$realcnt--; $realcnt--;
} }
my $hunk_line = ($realcnt != 0);
#make up the handle for any error we report on this line #make up the handle for any error we report on this line
$prefix = "$filename:$realline: " if ($emacs && $file); $prefix = "$filename:$realline: " if ($emacs && $file);
$prefix = "$filename:$linenr: " if ($emacs && !$file); $prefix = "$filename:$linenr: " if ($emacs && !$file);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment