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

Commit 9a974fdb authored by Andy Whitcroft's avatar Andy Whitcroft Committed by Linus Torvalds
Browse files

checkpatch: possible types -- prevent illegal modifiers being added 



Prevent known non types being detected as modifiers.  Ensure we do not
look at any type which starts with a keyword.

Signed-off-by: default avatarAndy Whitcroft <apw@canonical.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1a83e175

scripts/checkpatch.pl

+12 −8
Original line number Diff line number Diff line
@@ -997,23 +997,25 @@ sub annotate_values { 


sub possible {

	my ($possible, $line) = @_;



	print "CHECK<$possible> ($line)\n" if ($dbg_possible > 2);

	if ($possible !~ /(?:

	my $notPermitted = qr{(?:

		^(?:

			$Modifier|

			$Storage|

			$Type|

			DEFINE_\S+|

			DEFINE_\S+

		)$|

		^(?:

			goto|

			return|

			case|

			else|

			asm|__asm__|

			do

		)$|

		)(?:\s|$)|

		^(?:typedef|struct|enum)\b

	    )/x) {

	    )}x;

	warn "CHECK<$possible> ($line)\n" if ($dbg_possible > 2);

	if ($possible !~ $notPermitted) {

		# Check for modifiers.

		$possible =~ s/\s*$Storage\s*//g;

		$possible =~ s/\s*$Sparse\s*//g;
@@ -1022,9 +1024,11 @@ sub possible { 
		} elsif ($possible =~ /\s/) {

			$possible =~ s/\s*$Type\s*//g;

			for my $modifier (split(' ', $possible)) {

				if ($modifier !~ $notPermitted) {

					warn "MODIFIER: $modifier ($possible) ($line)\n" if ($dbg_possible);

					push(@modifierList, $modifier);

				}

			}



		} else {

			warn "POSSIBLE: $possible ($line)\n" if ($dbg_possible);