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

Commit 5a4e1fd3 authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

checkpatch: fix function pointers in blank line needed after declarations test 



Add a function pointer declaration check to the test for blank line
needed after declarations.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Reported-by: default avatarBruce W Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 356fd398

scripts/checkpatch.pl

+4 −0
Original line number Diff line number Diff line
@@ -2295,6 +2295,8 @@ sub process { 
		if ($sline =~ /^\+\s+\S/ &&			#Not at char 1

			# actual declarations

		    ($prevline =~ /^\+\s+$Declare\s*$Ident\s*[=,;:\[]/ ||

			# function pointer declarations

		     $prevline =~ /^\+\s+$Declare\s*\(\s*\*\s*$Ident\s*\)\s*[=,;:\[\(]/ ||

			# foo bar; where foo is some local typedef or #define

		     $prevline =~ /^\+\s+$Ident(?:\s+|\s*\*\s*)$Ident\s*[=,;\[]/ ||

			# known declaration macros
@@ -2307,6 +2309,8 @@ sub process { 
		      $prevline =~ /(?:\{\s*|\\)$/) &&

			# looks like a declaration

		    !($sline =~ /^\+\s+$Declare\s*$Ident\s*[=,;:\[]/ ||

			# function pointer declarations

		      $sline =~ /^\+\s+$Declare\s*\(\s*\*\s*$Ident\s*\)\s*[=,;:\[\(]/ ||

			# foo bar; where foo is some local typedef or #define

		      $sline =~ /^\+\s+$Ident(?:\s+|\s*\*\s*)$Ident\s*[=,;\[]/ ||

			# known declaration macros