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: Andy Whitcroft <apw@canonical.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Родитель
e2f7aa4b8b
Коммит
00ef4ece05
|
@ -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.
|
||||
|
|
Загрузка…
Ссылка в новой задаче