History

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.

Eddie Kovsky committed 11 years ago

Commit 4e5d56b1 parent bf4daf11 file · +4 −4Browse files

Showing the changes to scripts/checkpatch.pl (1 of 1 file). Show all

Unified · Split

scripts/checkpatch.pl+4−4
@@ -3571,7 +3571,7 @@ sub process { · 3570 unmodified lines
3571# function brace can't be on same line, except for #defines of do while,3571# function brace can't be on same line, except for #defines of do while,
3572# or if closed on same line3572# or if closed on same line
3573 if (($line=~/$Type\s*$Ident\(.*\).*\s*{/) and3573 if (($line=~/$Type\s*$Ident\(.*\).*\s*{/) and
3574 !($line=~/\#\s*define.*do\s{/) and !($line=~/}/)) {3574 !($line=~/\#\s*define.*do\s\{/) and !($line=~/}/)) {
3575 if (ERROR("OPEN_BRACE",3575 if (ERROR("OPEN_BRACE",
3576 "open brace '{' following function declarations go on the next line\n" . $herecurr) &&3576 "open brace '{' following function declarations go on the next line\n" . $herecurr) &&
3577 $fix) {3577 $fix) {
@@ -4083,8 +4083,8 @@ sub process { · 505 unmodified lines
4083## }4083## }
4084 4084
4085#need space before brace following if, while, etc4085#need space before brace following if, while, etc
4086 if (($line =~ /\(.*\){/ && $line !~ /\($Type\){/) ||4086 if (($line =~ /\(.*\)\{/ && $line !~ /\($Type\){/) ||
4087 $line =~ /do{/) {4087 $line =~ /do\{/) {
4088 if (ERROR("SPACING",4088 if (ERROR("SPACING",
4089 "space required before the open brace '{'\n" . $herecurr) &&4089 "space required before the open brace '{'\n" . $herecurr) &&
4090 $fix) {4090 $fix) {
@@ -4531,7 +4531,7 @@ sub process { · 440 unmodified lines
4531 $dstat !~ /^for\s*$Constant$/ && # for (...)4531 $dstat !~ /^for\s*$Constant$/ && # for (...)
4532 $dstat !~ /^for\s*$Constant\s+(?:$Ident|-?$Constant)$/ && # for (...) bar()4532 $dstat !~ /^for\s*$Constant\s+(?:$Ident|-?$Constant)$/ && # for (...) bar()
4533 $dstat !~ /^do\s*{/ && # do {...4533 $dstat !~ /^do\s*{/ && # do {...
4534 $dstat !~ /^\({/ && # ({...4534 $dstat !~ /^\(\{/ && # ({...
4535 $ctx !~ /^.\s*#\s*define\s+TRACE_(?:SYSTEM|INCLUDE_FILE|INCLUDE_PATH)\b/)4535 $ctx !~ /^.\s*#\s*define\s+TRACE_(?:SYSTEM|INCLUDE_FILE|INCLUDE_PATH)\b/)
4536 {4536 {
4537 $ctx =~ s/\n*$//;4537 $ctx =~ s/\n*$//;