Selaa lähdekoodia

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>
Andy Whitcroft 16 vuotta sitten
vanhempi
commit
63f17f8973
1 muutettua tiedostoa jossa 5 lisäystä ja 1 poistoa
  1. 5 1
      scripts/checkpatch.pl

+ 5 - 1
scripts/checkpatch.pl

@@ -2016,7 +2016,11 @@ sub process {
 
 
 			# Flatten any parentheses
 			# Flatten any parentheses
 			$value =~ s/\)\(/\) \(/g;
 			$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)$/) {
 			if ($value =~ /^(?:$Ident|-?$Constant)$/) {