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: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
636d140a80
commit
01fa91471e
1 changed files with 8 additions and 3 deletions
|
@ -1029,9 +1029,14 @@ sub process {
|
||||||
# edge is a close comment then we must be in a comment
|
# edge is a close comment then we must be in a comment
|
||||||
# at context start.
|
# at context start.
|
||||||
my $edge;
|
my $edge;
|
||||||
for (my $ln = $linenr + 1; $ln < ($linenr + $realcnt); $ln++) {
|
my $cnt = $realcnt;
|
||||||
next if ($line =~ /^-/);
|
for (my $ln = $linenr + 1; $cnt > 0; $ln++) {
|
||||||
($edge) = ($rawlines[$ln - 1] =~ m@(/\*|\*/)@);
|
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);
|
last if (defined $edge);
|
||||||
}
|
}
|
||||||
if (defined $edge && $edge eq '*/') {
|
if (defined $edge && $edge eq '*/') {
|
||||||
|
|
Loading…
Reference in a new issue