checkpatch: comment ends inside strings is most likely not an open comment
When we are detecting whether a comment is open when we start a hunk we check for the first comment edge in the hunk and assume its inverse. However if the hunk contains something like below, then we will assume that a comment was open. Update this heuristic to see if the comment edge is obviously within double quotes and ignore it if so: foo(" */); 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
8e761b04a3
commit
fae17daed7
|
@ -367,7 +367,7 @@ sub sanitise_line {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#print "SQ:$sanitise_quote\n";
|
#print "c<$c> SQ<$sanitise_quote>\n";
|
||||||
if ($off != 0 && $sanitise_quote eq '*/' && $c ne "\t") {
|
if ($off != 0 && $sanitise_quote eq '*/' && $c ne "\t") {
|
||||||
substr($res, $off, 1, $;);
|
substr($res, $off, 1, $;);
|
||||||
} elsif ($off != 0 && $sanitise_quote && $c ne "\t") {
|
} elsif ($off != 0 && $sanitise_quote && $c ne "\t") {
|
||||||
|
@ -1103,8 +1103,11 @@ sub process {
|
||||||
$cnt--;
|
$cnt--;
|
||||||
#print "RAW<$rawlines[$ln - 1]>\n";
|
#print "RAW<$rawlines[$ln - 1]>\n";
|
||||||
last if (!defined $rawlines[$ln - 1]);
|
last if (!defined $rawlines[$ln - 1]);
|
||||||
($edge) = ($rawlines[$ln - 1] =~ m@(/\*|\*/)@);
|
if ($rawlines[$ln - 1] =~ m@(/\*|\*/)@ &&
|
||||||
last if (defined $edge);
|
$rawlines[$ln - 1] !~ m@"[^"]*(?:/\*|\*/)[^"]*"@) {
|
||||||
|
($edge) = $1;
|
||||||
|
last;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (defined $edge && $edge eq '*/') {
|
if (defined $edge && $edge eq '*/') {
|
||||||
$in_comment = 1;
|
$in_comment = 1;
|
||||||
|
|
Loading…
Reference in New Issue