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: Joe Perches <joe@perches.com> Reported-by: Bruce W Allan <bruce.w.allan@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
356fd39813
commit
5a4e1fd37d
|
@ -2295,6 +2295,8 @@ sub process {
|
||||||
if ($sline =~ /^\+\s+\S/ && #Not at char 1
|
if ($sline =~ /^\+\s+\S/ && #Not at char 1
|
||||||
# actual declarations
|
# actual declarations
|
||||||
($prevline =~ /^\+\s+$Declare\s*$Ident\s*[=,;:\[]/ ||
|
($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
|
# foo bar; where foo is some local typedef or #define
|
||||||
$prevline =~ /^\+\s+$Ident(?:\s+|\s*\*\s*)$Ident\s*[=,;\[]/ ||
|
$prevline =~ /^\+\s+$Ident(?:\s+|\s*\*\s*)$Ident\s*[=,;\[]/ ||
|
||||||
# known declaration macros
|
# known declaration macros
|
||||||
|
@ -2307,6 +2309,8 @@ sub process {
|
||||||
$prevline =~ /(?:\{\s*|\\)$/) &&
|
$prevline =~ /(?:\{\s*|\\)$/) &&
|
||||||
# looks like a declaration
|
# looks like a declaration
|
||||||
!($sline =~ /^\+\s+$Declare\s*$Ident\s*[=,;:\[]/ ||
|
!($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
|
# foo bar; where foo is some local typedef or #define
|
||||||
$sline =~ /^\+\s+$Ident(?:\s+|\s*\*\s*)$Ident\s*[=,;\[]/ ||
|
$sline =~ /^\+\s+$Ident(?:\s+|\s*\*\s*)$Ident\s*[=,;\[]/ ||
|
||||||
# known declaration macros
|
# known declaration macros
|
||||||
|
|
Loading…
Reference in New Issue