From: Chengyu Zheng Date: Sun, 9 Apr 2017 16:55:02 +0000 (+0200) Subject: tools/scripts/checkpatch.pl: fix unescaped brace X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6e8217784bfe4027a753f75a2c0fe732bfd8d2e0;p=openocd tools/scripts/checkpatch.pl: fix unescaped brace Change-Id: If1d0fbe95223351ea098504cf24f076784b26a9c Signed-off-by: Chengyu Zheng Reviewed-on: http://openocd.zylin.com/4102 Tested-by: jenkins Reviewed-by: Freddie Chopin --- diff --git a/tools/scripts/checkpatch.pl b/tools/scripts/checkpatch.pl index 92befc6f..b977d361 100755 --- a/tools/scripts/checkpatch.pl +++ b/tools/scripts/checkpatch.pl @@ -2224,7 +2224,7 @@ sub process { # function brace can't be on same line, except for #defines of do while, # or if closed on same line - if (($line=~/$Type\s*$Ident\(.*\).*\s{/) and + if (($line=~/$Type\s*$Ident\(.*\).*\s\{/) and !($line=~/\#\s*define.*do\s\{/) and !($line=~/}/)) { ERROR("OPEN_BRACE", "open brace '{' following function declarations go on the next line\n" . $herecurr);