[PATCH v2] checkpatch: avoid false positive closing brace with initializers

From: Carlo Marcelo Arenas BelÃn
Date: Tue Oct 24 2017 - 14:56:03 EST


when multiple closing braces are being used for an universal zero
intializer as in (for example):

struct timespec tv[10] = {{0}};

Signed-off-by: Carlo Marcelo Arenas BelÃn <carenas@xxxxxxxxx>
---
v2: simplified regex as suggested by Joe Perches
scripts/checkpatch.pl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 8b80bac055e4..9cfbdd8554fc 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -4423,12 +4423,12 @@ sub process {

# closing brace should have a space following it when it has anything
# on the line
- if ($line =~ /}(?!(?:,|;|\)))\S/) {
+ if ($line =~ /}(?![,;})])\S/) {
if (ERROR("SPACING",
"space required after that close brace '}'\n" . $herecurr) &&
$fix) {
$fixed[$fixlinenr] =~
- s/}((?!(?:,|;|\)))\S)/} $1/;
+ s/}((?![,;})])\S)/} $1/;
}
}

--
2.14.2