checkpatch: catch [ ... ] usage when not at the beginning of definition

Andy Whitcroft · torvalds · commit daebc534ac15 · 2012-03-23T16:58:36.000-07:00
Handle the [ A ... B ] form deeper into a definition, for example:

    static const unsigned char pci_irq_swizzle[2][PCI_MAX_DEVICES] = {
	    {0, 0, 0, 0, 0, 0, 0, 27, 27, [9 ... PCI_MAX_DEVICES - 1] = 0 },
	    {0, 0, 0, 0, 0, 0, 0, 29, 29, [9 ... PCI_MAX_DEVICES - 1] = 0 },
    };

Reported-by: Marek Vasut &lt;marek.vasut@gmail.com&gt;
Signed-off-by: Andy Whitcroft &lt;apw@canonical.com&gt;
Cc: Joe Perches &lt;joe@perches.com&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
@@ -2391,7 +2391,7 @@ sub process {
 			my ($where, $prefix) = ($-[1], $1);
 			if ($prefix !~ /$Type\s+$/ &&
 			    ($where != 0 || $prefix !~ /^.\s+$/) &&
-			    $prefix !~ /{\s+$/) {
+			    $prefix !~ /[{,]\s+$/) {
 				ERROR("BRACKET_SPACE",
 				      "space prohibited before open square bracket '['\n" . $herecurr);
 			}

Original file line number	Diff line number	Diff line change
`@@ -2391,7 +2391,7 @@ sub process {`
`2391`	`2391`	`my ($where, $prefix) = ($-[1], $1);`
`2392`	`2392`	`if ($prefix !~ /$Type\s+$/ &&`
`2393`	`2393`	`($where != 0 \|\| $prefix !~ /^.\s+$/) &&`
`2394`		`- $prefix !~ /{\s+$/) {`
	`2394`	`+ $prefix !~ /[{,]\s+$/) {`
`2395`	`2395`	`ERROR("BRACKET_SPACE",`
`2396`	`2396`	`"space prohibited before open square bracket '['\n" . $herecurr);`
`2397`	`2397`	`}`