From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41476) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZrjpJ-0004bk-QJ for qemu-devel@nongnu.org; Thu, 29 Oct 2015 05:48:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZrjpF-0003AV-Kk for qemu-devel@nongnu.org; Thu, 29 Oct 2015 05:48:57 -0400 Received: from mail-wi0-x233.google.com ([2a00:1450:400c:c05::233]:34056) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZrjpF-0003AQ-FJ for qemu-devel@nongnu.org; Thu, 29 Oct 2015 05:48:53 -0400 Received: by wikq8 with SMTP id q8so278584569wik.1 for ; Thu, 29 Oct 2015 02:48:53 -0700 (PDT) From: Leonid Bloch Date: Thu, 29 Oct 2015 11:48:37 +0200 Message-Id: <1446112118-12376-2-git-send-email-leonid@daynix.com> In-Reply-To: <1446112118-12376-1-git-send-email-leonid@daynix.com> References: <1446112118-12376-1-git-send-email-leonid@daynix.com> Subject: [Qemu-devel] [PATCH 1/2] checkpatch: Eliminate false positive in case of comma-space-square bracket List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Blue Swirl Previously, an error was printed in cases such as: { [1] = 5, [2] = 6 } The space passed OK after a curly brace, but not after a comma. Now, a space before a square bracket is allowed, if a comma comes before it. Signed-off-by: Leonid Bloch --- scripts/checkpatch.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index b0f6e11..455d94b 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1715,11 +1715,13 @@ sub process { # 1. with a type on the left -- int [] a; # 2. at the beginning of a line for slice initialisers -- [0...10] = 5, # 3. inside a curly brace -- = { [0...10] = 5 } +# 4. after a comma -- [1] = 5, [2] = 6 while ($line =~ /(.*?\s)\[/g) { my ($where, $prefix) = ($-[1], $1); if ($prefix !~ /$Type\s+$/ && ($where != 0 || $prefix !~ /^.\s+$/) && - $prefix !~ /{\s+$/) { + $prefix !~ /{\s+$/ && + $prefix !~ /,\s+$/) { ERROR("space prohibited before open square bracket '['\n" . $herecurr); } } -- 2.4.3