aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Whitcroft <apw@shadowen.org>2009-01-06 17:41:20 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-06 18:59:15 -0500
commitfae17daed7312bae708df0cce7e93971308698b5 (patch)
treec31028127007a5481dfec1b90a90f072e3517a89
parent8e761b04a34288a3b0b29c0f49cdf157d7db8863 (diff)
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>
-rwxr-xr-xscripts/checkpatch.pl9
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 9883de38b446..45a97c9f4c9b 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -367,7 +367,7 @@ sub sanitise_line {
367 } 367 }
368 } 368 }
369 369
370 #print "SQ:$sanitise_quote\n"; 370 #print "c<$c> SQ<$sanitise_quote>\n";
371 if ($off != 0 && $sanitise_quote eq '*/' && $c ne "\t") { 371 if ($off != 0 && $sanitise_quote eq '*/' && $c ne "\t") {
372 substr($res, $off, 1, $;); 372 substr($res, $off, 1, $;);
373 } elsif ($off != 0 && $sanitise_quote && $c ne "\t") { 373 } elsif ($off != 0 && $sanitise_quote && $c ne "\t") {
@@ -1103,8 +1103,11 @@ sub process {
1103 $cnt--; 1103 $cnt--;
1104 #print "RAW<$rawlines[$ln - 1]>\n"; 1104 #print "RAW<$rawlines[$ln - 1]>\n";
1105 last if (!defined $rawlines[$ln - 1]); 1105 last if (!defined $rawlines[$ln - 1]);
1106 ($edge) = ($rawlines[$ln - 1] =~ m@(/\*|\*/)@); 1106 if ($rawlines[$ln - 1] =~ m@(/\*|\*/)@ &&
1107 last if (defined $edge); 1107 $rawlines[$ln - 1] !~ m@"[^"]*(?:/\*|\*/)[^"]*"@) {
1108 ($edge) = $1;
1109 last;
1110 }
1108 } 1111 }
1109 if (defined $edge && $edge eq '*/') { 1112 if (defined $edge && $edge eq '*/') {
1110 $in_comment = 1; 1113 $in_comment = 1;