Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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: 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 8e761b04

scripts/checkpatch.pl

+6 −3
Original line number Diff line number Diff line
@@ -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") {

			substr($res, $off, 1, $;);

		} elsif ($off != 0 && $sanitise_quote && $c ne "\t") {
@@ -1103,8 +1103,11 @@ sub process { 
				$cnt--;

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

				last if (!defined $rawlines[$ln - 1]);

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

				last if (defined $edge);

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

				    $rawlines[$ln - 1] !~ m@"[^"]*(?:/\*|\*/)[^"]*"@) {

					($edge) = $1;

					last;

				}

			}

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

				$in_comment = 1;