aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorAndy Whitcroft <apw@shadowen.org>2008-10-16 01:02:15 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 14:21:34 -0400
commitfe2a7dbc85f37c721133c83c856f845c4ce9b602 (patch)
treecbf28b825b378678812884be6543fddde0a87c41 /scripts
parent0fcff28f47194445f37264d750dbb13d3d894d0b (diff)
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>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/checkpatch.pl6
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 }