Commit 01fa9147 authored by Andy Whitcroft's avatar Andy Whitcroft Committed by Linus Torvalds
Browse files

checkpatch: fix up comment checks search to scan the entire block 



We are not counting the lines in the block correctly which causes the
comment scan to stop prematurly and thus miss comments which end at the
end of the block.  Fix this up.

Signed-off-by: default avatarAndy Whitcroft <apw@shadowen.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 636d140a

scripts/checkpatch.pl

+8 −3
Original line number Diff line number Diff line
@@ -1029,9 +1029,14 @@ sub process { 
			# edge is a close comment then we must be in a comment

			# at context start.

			my $edge;

			for (my $ln = $linenr + 1; $ln < ($linenr + $realcnt); $ln++) {

				next if ($line =~ /^-/);

				($edge) = ($rawlines[$ln - 1] =~ m@(/\*|\*/)@);

			my $cnt = $realcnt;

			for (my $ln = $linenr + 1; $cnt > 0; $ln++) {

				next if (defined $rawlines[$ln - 1] &&

					 $rawlines[$ln - 1] =~ /^-/);

				$cnt--;

				#print "RAW<$rawlines[$ln - 1]>\n";

				($edge) = (defined $rawlines[$ln - 1] &&

					$rawlines[$ln - 1] =~ m@(/\*|\*/)@);

				last if (defined $edge);

			}

			if (defined $edge && $edge eq '*/') {

CRA Git | Maintained and supported by SUSTech CRA and CCSE