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

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

checkpatch: Add --strict test for function pointer calling style 



Peter Hurley wrote:

The use of older function ptr calling style, (*fn)(), makes static
analysis more error-prone; replace with modern fn() style.

So make checkpatch emit a --strict test for that condition.

Update the unnecessary parentheses test for dereferencing
objects at the same time and create a $fix mechanism too.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Cc: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e0d975b1

scripts/checkpatch.pl

+21 −3
Original line number Diff line number Diff line
@@ -3844,8 +3844,26 @@ sub process { 
# ie: &(foo->bar) should be &foo->bar and *(foo->bar) should be *foo->bar



		while ($line =~ /(?:[^&]&\s*|\*)\(\s*($Ident\s*(?:$Member\s*)+)\s*\)/g) {

			CHK("UNNECESSARY_PARENTHESES",

			    "Unnecessary parentheses around $1\n" . $herecurr);

			my $var = $1;

			if (CHK("UNNECESSARY_PARENTHESES",

				"Unnecessary parentheses around $var\n" . $herecurr) &&

			    $fix) {

				$fixed[$fixlinenr] =~ s/\(\s*\Q$var\E\s*\)/$var/;

			}

		}



# check for unnecessary parentheses around function pointer uses

# ie: (foo->bar)(); should be foo->bar();

# but not "if (foo->bar) (" to avoid some false positives

		if ($line =~ /(\bif\s*|)(\(\s*$Ident\s*(?:$Member\s*)+\))[ \t]*\(/ && $1 !~ /^if/) {

			my $var = $2;

			if (CHK("UNNECESSARY_PARENTHESES",

				"Unnecessary parentheses around function pointer $var\n" . $herecurr) &&

			    $fix) {

				my $var2 = deparenthesize($var);

				$var2 =~ s/\s//g;

				$fixed[$fixlinenr] =~ s/\Q$var\E/$var2/;

			}

		}



#goto labels aren't indented, allow a single space however