Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e5d56bd authored by Eddie Kovsky's avatar Eddie Kovsky Committed by Linus Torvalds
Browse files

checkpatch: fix left brace warning 



Using checkpatch.pl with Perl 5.22.0 generates the following warning:

    Unescaped left brace in regex is deprecated, passed through in regex;

This patch fixes the warnings by escaping occurrences of the left brace
inside the regular expression.

Signed-off-by: default avatarEddie Kovsky <ewk@edkovsky.org>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bf4daf12

scripts/checkpatch.pl

+4 −4
Original line number Diff line number Diff line
@@ -3571,7 +3571,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=~/}/)) {

			if (ERROR("OPEN_BRACE",

				  "open brace '{' following function declarations go on the next line\n" . $herecurr) &&

			    $fix) {
@@ -4083,8 +4083,8 @@ sub process { 
## 		}



#need space before brace following if, while, etc

		if (($line =~ /\(.*\){/ && $line !~ /\($Type\){/) ||

		    $line =~ /do{/) {

		if (($line =~ /\(.*\)\{/ && $line !~ /\($Type\){/) ||

		    $line =~ /do\{/) {

			if (ERROR("SPACING",

				  "space required before the open brace '{'\n" . $herecurr) &&

			    $fix) {
@@ -4531,7 +4531,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*#\s*define\s+TRACE_(?:SYSTEM|INCLUDE_FILE|INCLUDE_PATH)\b/)

			{

				$ctx =~ s/\n*$//;