Commit 4dbed76f authored May 08, 2017 by Joe Perches Committed by Linus Torvalds May 08, 2017

checkpatch: improve EMBEDDED_FUNCTION_NAME test

The existing behavior relies on patch context to identify function
declarations.  Add the ability to find function declarations when there
is an open brace in column 1.

This finds function declarations only in specific single line forms
where the function name is on a single line like:

  int foo(args...)
  {

and

  int
  foo(args...)
  {

It does not recognize function declarations like:

  int foo(int bar,
          int baz)
  {

Link: http://lkml.kernel.org/r/738d74bbbe1a06b80f11ed504818107c68903095.1488155636.git.joe@perches.com


Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 0b523769

scripts/checkpatch.pl

+11 −0

Original line number	Diff line number	Diff line
		@@ -3126,6 +3126,17 @@ sub process {
		# check we are in a valid C source file if not then ignore this hunk
		next if ($realfile !~ /\.(h\|c)$/);

		# check if this appears to be the start function declaration, save the name
		if ($sline =~ /^\+\{\s*$/ &&
		$prevline =~ /^\+(?:(?:(?:$Storage\|$Inline)\s)\s$Type\s)?($Ident)\(/) {
		$context_function = $1;
		}

		# check if this appears to be the end of function declaration
		if ($sline =~ /^\+\}\s*$/) {
		undef $context_function;
		}

		# check indentation of any line with a bare else
		# (but not if it is a multiple line "if (foo) return bar; else return baz;")
		# if the previous line is a break or return and is indented 1 tab more...

Admin message