checkpatch: square brackets -- exemption for array slices in braces
It is wholy reasonable to have square brackets representing array slices in braces on the same line. These should be spaced. Signed-off-by: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
0fcff28f47
commit
fe2a7dbc85
1 changed files with 4 additions and 2 deletions
|
@ -1493,11 +1493,13 @@ sub process {
|
||||||
|
|
||||||
# check for spacing round square brackets; allowed:
|
# check for spacing round square brackets; allowed:
|
||||||
# 1. with a type on the left -- int [] a;
|
# 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) {
|
while ($line =~ /(.*?\s)\[/g) {
|
||||||
my ($where, $prefix) = ($-[1], $1);
|
my ($where, $prefix) = ($-[1], $1);
|
||||||
if ($prefix !~ /$Type\s+$/ &&
|
if ($prefix !~ /$Type\s+$/ &&
|
||||||
($where != 0 || $prefix !~ /^.\s+$/)) {
|
($where != 0 || $prefix !~ /^.\s+$/) &&
|
||||||
|
$prefix !~ /{\s+$/) {
|
||||||
ERROR("space prohibited before open square bracket '['\n" . $herecurr);
|
ERROR("space prohibited before open square bracket '['\n" . $herecurr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue