---

yaml --- r: 114749 b: refs/heads/master c: fe2a7db h: refs/heads/master i: 114747: c4ffa17 v: v3
git-mirror · Oct 16, 2008 · 6660c42 · 6660c42
1 parent d813510
commit 6660c42
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0fcff28f47194445f37264d750dbb13d3d894d0b
+refs/heads/master: fe2a7dbc85f37c721133c83c856f845c4ce9b602
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
@@ -1493,11 +1493,13 @@ sub process {
 
 # check for spacing round square brackets; allowed:
 #  1. with a type on the left -- int [] a;
-#  2. at the beginning of a line for slice initialisers -- [0..10] = 5,
+#  2. at the beginning of a line for slice initialisers -- [0...10] = 5,
+#  3. inside a curly brace -- = { [0...10] = 5 }
 		while ($line =~ /(.*?\s)\[/g) {
 			my ($where, $prefix) = ($-[1], $1);
 			if ($prefix !~ /$Type\s+$/ &&
-			    ($where != 0 || $prefix !~ /^.\s+$/)) {
+			    ($where != 0 || $prefix !~ /^.\s+$/) &&
+			    $prefix !~ /{\s+$/) {
 				ERROR("space prohibited before open square bracket '['\n" . $herecurr);
 			}
 		}