---

yaml --- r: 114780 b: refs/heads/master c: bf30d6e h: refs/heads/master v: v3
git-mirror · Oct 16, 2008 · c6882e3 · c6882e3
1 parent 0d8a750
commit c6882e3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f16fa28f7b3d95e989fc64c8480e44c1bcf4bac3
+refs/heads/master: bf30d6ede099c2a31b13bbd05b1022dc0da684d5
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
@@ -2142,9 +2142,10 @@ sub process {
 			$dstat =~ s/\s*$//s;
 
 			# Flatten any parentheses and braces
-			while ($dstat =~ s/\([^\(\)]*\)/1/) {
-			}
-			while ($dstat =~ s/\{[^\{\}]*\}/1/) {
+			while ($dstat =~ s/\([^\(\)]*\)/1/ ||
+			       $dstat =~ s/\{[^\{\}]*\}/1/ ||
+			       $dstat =~ s/\[[^\{\}]*\]/1/)
+			{
 			}
 
 			my $exceptions = qr{