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

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

checkpatch: comment detection: ignore macro continuation when detecting associated comments 



When looking for an associated comment they may be suffixed by a macro
continuation.  Ignore this.

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 d3ddcf47

scripts/checkpatch.pl

+1 −1
Original line number Diff line number Diff line
@@ -631,7 +631,7 @@ sub ctx_locate_comment { 
	my ($first_line, $end_line) = @_;



	# Catch a comment on the end of the line itself.

	my ($current_comment) = ($rawlines[$end_line - 1] =~ m@.*(/\*.*\*/)\s*$@);

	my ($current_comment) = ($rawlines[$end_line - 1] =~ m@.*(/\*.*\*/)\s*(?:\\\s*)?$@);

	return $current_comment if (defined $current_comment);



	# Look through the context and try and figure out if there is a