Commit fe2a7dbc authored by Andy Whitcroft's avatar Andy Whitcroft Committed by Linus Torvalds
Browse files

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: default avatarAndy Whitcroft <apw@shadowen.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0fcff28f

scripts/checkpatch.pl

+4 −2
Original line number Diff line number Diff line
@@ -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);

			}

		}