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

Commit 00ef4ece authored by Andy Whitcroft's avatar Andy Whitcroft Committed by Linus Torvalds
Browse files

checkpatch: correctly handle type spacing in the face of modifiers 



We need to handle interspersed modifiers in the middle of pointer types,
for example:

	void * __user * __user bar;

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 e2f7aa4b

scripts/checkpatch.pl

+2 −2
Original line number Diff line number Diff line
@@ -1658,7 +1658,7 @@ sub process { 


# * goes on variable not on type

		# (char*[ const])

		if ($line =~ m{\($NonptrType(\s*\*[\s\*]*(?:$Modifier\s*)*)\)}) {

		if ($line =~ m{\($NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)\)}) {

			my ($from, $to) = ($1, $1);



			# Should start with a space.
@@ -1673,7 +1673,7 @@ sub process { 
			if ($from ne $to) {

				ERROR("\"(foo$from)\" should be \"(foo$to)\"\n" .  $herecurr);

			}

		} elsif ($line =~ m{\b$NonptrType(\s*\*[\s\*]*(?:$Modifier\s*)?)($Ident)}) {

		} elsif ($line =~ m{\b$NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)($Ident)}) {

			my ($from, $to, $ident) = ($1, $1, $2);



			# Should start with a space.