diff options
-rwxr-xr-x | scripts/checkpatch.pl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index bc6779398229..6f821a0e0024 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl | |||
@@ -1493,11 +1493,13 @@ sub process { | |||
1493 | 1493 | ||
1494 | # check for spacing round square brackets; allowed: | 1494 | # check for spacing round square brackets; allowed: |
1495 | # 1. with a type on the left -- int [] a; | 1495 | # 1. with a type on the left -- int [] a; |
1496 | # 2. at the beginning of a line for slice initialisers -- [0..10] = 5, | 1496 | # 2. at the beginning of a line for slice initialisers -- [0...10] = 5, |
1497 | # 3. inside a curly brace -- = { [0...10] = 5 } | ||
1497 | while ($line =~ /(.*?\s)\[/g) { | 1498 | while ($line =~ /(.*?\s)\[/g) { |
1498 | my ($where, $prefix) = ($-[1], $1); | 1499 | my ($where, $prefix) = ($-[1], $1); |
1499 | if ($prefix !~ /$Type\s+$/ && | 1500 | if ($prefix !~ /$Type\s+$/ && |
1500 | ($where != 0 || $prefix !~ /^.\s+$/)) { | 1501 | ($where != 0 || $prefix !~ /^.\s+$/) && |
1502 | $prefix !~ /{\s+$/) { | ||
1501 | ERROR("space prohibited before open square bracket '['\n" . $herecurr); | 1503 | ERROR("space prohibited before open square bracket '['\n" . $herecurr); |
1502 | } | 1504 | } |
1503 | } | 1505 | } |