From: John Crispin <john@openwrt.org>
Date: Mon, 2 Nov 2015 10:17:03 +0000 (+0000)
Subject: scripts/checkpatch.pl: Fix deprecation warnings
X-Git-Tag: reboot~1677
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0aeb0ae938ee10e238d0898bf0560e6586f9b9f7;p=openwrt%2Fstaging%2Fblogic.git

scripts/checkpatch.pl: Fix deprecation warnings

In perl version v5.22, use of unescaped opening braces is deprecated

Signed-off-by: Javier Domingo Cansino <javierdo1@gmail.com>

SVN-Revision: 47342
---

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 5e2c0b9f1ccd..78053338c034 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2354,8 +2354,8 @@ 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=~/}/)) {
+		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);
 		}
@@ -2623,8 +2623,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);
 		}
@@ -2914,7 +2914,7 @@ sub process {
 			    $dstat !~ /^for\s*$Constant$/ &&				# for (...)
 			    $dstat !~ /^for\s*$Constant\s+(?:$Ident|-?$Constant)$/ &&	# for (...) bar()
 			    $dstat !~ /^do\s*{/ &&					# do {...
-			    $dstat !~ /^\({/)						# ({...
+			    $dstat !~ /^\(\{/)						# ({...
 			{
 				$ctx =~ s/\n*$//;
 				my $herectx = $here . "\n";