Commit cc77cdca authored Oct 26, 2009 by Andy Whitcroft Committed by Linus Torvalds Oct 29, 2009

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: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 9a974fdb

scripts/checkpatch.pl

+2 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message