Commit a55ee0cc authored Jun 04, 2020 by Joe Perches Committed by Linus Torvalds Jun 04, 2020

checkpatch: look for c99 comments in ctx_locate_comment



Some checks look for comments around a specific function like
read_barrier_depends.

Extend the check to support both c89 and c90 comment styles.

	c89 /* comment */
or
	c99 // comment

For c99 comments, only look a 3 single lines, the line being scanned,
the line above and the line below the line being scanned rather than
the patch diff context.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Tested-by: Paul E. McKenney <paulmck@kernel.org>
Cc: Marco Elver <elver@google.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andrey Konovalov <andreyknvl@google.com>
Cc: Andy Whitcroft <apw@canonical.com>
Cc: Will Deacon <will@kernel.org>
Link: http://lkml.kernel.org/r/65cb075435d2f385a53c77571b491b2b09faaf8e.camel@perches.com


Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 7ccf41a8

scripts/checkpatch.pl

+9 −1

Original line number	Diff line number	Diff line
		@@ -1676,8 +1676,16 @@ sub ctx_statement_level {
		sub ctx_locate_comment {
		my ($first_line, $end_line) = @_;

		# If c99 comment on the current line, or the line before or after
		my ($current_comment) = ($rawlines[$end_line - 1] =~ m@^\+.(//.$)@);
		return $current_comment if (defined $current_comment);
		($current_comment) = ($rawlines[$end_line - 2] =~ m@^[\+ ].(//.$)@);
		return $current_comment if (defined $current_comment);
		($current_comment) = ($rawlines[$end_line] =~ m@^[\+ ].(//.$)@);
		return $current_comment if (defined $current_comment);

		# Catch a comment on the end of the line itself.
		my ($current_comment) = ($rawlines[$end_line - 1] =~ m@.(/\.\/)\s(?:\\\s)?$@);
		($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

Admin message