summaryrefslogtreecommitdiffstats
path: root/scripts/checkpatch.pl
diff options
context:
space:
mode:
authorEddie Kovsky <ewk@edkovsky.org>2015-09-09 18:37:52 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2015-09-10 16:29:01 -0400
commit4e5d56bdf892e18832a6540b63ebf709966bce2a (patch)
treec41b7ac401088fc41450bb6c7bdaf8e6a2accb2d /scripts/checkpatch.pl
parentbf4daf12a9fbc818029051c97b65fbfca6366a44 (diff)
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: Eddie Kovsky <ewk@edkovsky.org> Cc: Joe Perches <joe@perches.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'scripts/checkpatch.pl')
-rwxr-xr-xscripts/checkpatch.pl8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 577241ed3696..ba47dab3d091 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3571,7 +3571,7 @@ sub process {
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 line 3572# or if closed on same line
3573 if (($line=~/$Type\s*$Ident\(.*\).*\s*{/) and 3573 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 {
4083## } 4083## }
4084 4084
4085#need space before brace following if, while, etc 4085#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 {
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*$//;