From 18a6fdc154ed61c641e2238c0f0ea6af0331c248 Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Sat, 6 Feb 2016 16:30:10 +0300 Subject: [PATCH] checkpatch.pl: fix unescaped left brace warnings Basically, same as upstream 4e5d56bdf892e18832a6540b63ebf709966bce2a. Unescaped left brace in string literals is deprecated since perl v5.21.1. Change-Id: I0e5f23bef821d2dca6ff4909ddbb06f4992718d4 Signed-off-by: Paul Fertser Reviewed-on: http://openocd.zylin.com/3228 Tested-by: jenkins Reviewed-by: Daniel Thompson --- tools/scripts/checkpatch.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/scripts/checkpatch.pl b/tools/scripts/checkpatch.pl index 4eb50c3c..92befc6f 100755 --- a/tools/scripts/checkpatch.pl +++ b/tools/scripts/checkpatch.pl @@ -2225,7 +2225,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 - !($line=~/\#\s*define.*do\s{/) and !($line=~/}/)) { + !($line=~/\#\s*define.*do\s\{/) and !($line=~/}/)) { ERROR("OPEN_BRACE", "open brace '{' following function declarations go on the next line\n" . $herecurr); } @@ -2493,8 +2493,8 @@ sub process { ## } #need space before brace following if, while, etc - if (($line =~ /\(.*\){/ && $line !~ /\($Type\){/) || - $line =~ /do{/) { + if (($line =~ /\(.*\)\{/ && $line !~ /\($Type\){/) || + $line =~ /do\{/) { ERROR("SPACING", "space required before the open brace '{'\n" . $herecurr); } -- 2.39.5