diff options
| author | Andy Whitcroft <apw@canonical.com> | 2009-01-15 13:51:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-15 16:39:38 -0800 |
| commit | 63f17f8973ccdb8260e59ce5b1b4e2b2ee0401f0 (patch) | |
| tree | d37e5333ccb5ea5467f6d98d2efd4c1daf681364 /scripts | |
| parent | f9a0b3d17a01fe1ba24ce1e9c18666a52052e011 (diff) | |
| download | kernel_goldelico_gta04-63f17f8973ccdb8260e59ce5b1b4e2b2ee0401f0.zip kernel_goldelico_gta04-63f17f8973ccdb8260e59ce5b1b4e2b2ee0401f0.tar.gz kernel_goldelico_gta04-63f17f8973ccdb8260e59ce5b1b4e2b2ee0401f0.tar.bz2 | |
checkpatch: allow parentheses on return handle array values
When we allow return to have surrounding parentheses when containing
comparison operators we are not correctly handling the case where the
values contain array sufffixes. Squash them.
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>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/checkpatch.pl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 1d7924a..696196e 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2016,7 +2016,11 @@ sub process { # Flatten any parentheses $value =~ s/\)\(/\) \(/g; - while ($value !~ /(?:$Ident|-?$Constant)\s*$Compare\s*(?:$Ident|-?$Constant)/ && $value =~ s/\([^\(\)]*\)/1/) { + while ($value =~ s/\[[^\{\}]*\]/1/ || + $value !~ /(?:$Ident|-?$Constant)\s* + $Compare\s* + (?:$Ident|-?$Constant)/x && + $value =~ s/\([^\(\)]*\)/1/) { } if ($value =~ /^(?:$Ident|-?$Constant)$/) { |