aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAndy Whitcroft <apw@shadowen.org>2008-10-15 22:02:15 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 11:21:34 -0700
commitfe2a7dbc85f37c721133c83c856f845c4ce9b602 (patch)
treecbf28b825b378678812884be6543fddde0a87c41 /scripts
parent0fcff28f47194445f37264d750dbb13d3d894d0b (diff)
downloadlinux-linaro-fe2a7dbc85f37c721133c83c856f845c4ce9b602.tar.gz
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 bc677939822..6f821a0e002 100755
--- a/scripts/checkpatch.pl
+++ b/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);
}
}