mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

checkpatch: Escape left braces in regex

Browse Source 
Latest perl now deprecates "{" literal in regex and print warnings like
"unescaped left brace in regex is deprecated".  Add escape to keep it
happy.

Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <1441969656-2640-1-git-send-email-famz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Fam Zheng 2015-09-11 19:07:36 +08:00 committed by Paolo Bonzini
parent e6b65fe1c2
commit 04f2562f8e
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/checkpatch.pl
View File

@ -582,7 +582,7 @@ sub statement_block_size {
my ($stmt) = @_; my ($stmt) = @_;
$stmt =~ s/(^|\n)./$1/g; $stmt =~ s/(^|\n)./$1/g;
$stmt =~ s/^\s*{//; $stmt =~ s/^\s*\{//;
$stmt =~ s/}\s*$//; $stmt =~ s/}\s*$//;
$stmt =~ s/^\s*//; $stmt =~ s/^\s*//;
$stmt =~ s/\s*$//; $stmt =~ s/\s*$//;
@ -1479,7 +1479,7 @@ sub process {
# 79 or 80 characters, it is no longer possible to add a space and an # 79 or 80 characters, it is no longer possible to add a space and an
# opening brace there) # opening brace there)
if ($#ctx == 0 && $ctx !~ /{\s*/ && if ($#ctx == 0 && $ctx !~ /{\s*/ &&
defined($lines[$ctx_ln - 1]) && $lines[$ctx_ln - 1] =~ /^\+\s*{/ && defined($lines[$ctx_ln - 1]) && $lines[$ctx_ln - 1] =~ /^\+\s*\{/ &&
defined($lines[$ctx_ln - 2]) && length($lines[$ctx_ln - 2]) < 80) { defined($lines[$ctx_ln - 2]) && length($lines[$ctx_ln - 2]) < 80) {
ERROR("that open brace { should be on the previous line\n" . ERROR("that open brace { should be on the previous line\n" .
"$here\n$ctx\n$rawlines[$ctx_ln - 1]\n"); "$here\n$ctx\n$rawlines[$ctx_ln - 1]\n");
@ -1519,7 +1519,7 @@ sub process {
my $continuation = 0; my $continuation = 0;
my $check = 0; my $check = 0;
$s =~ s/^.*\bdo\b//; $s =~ s/^.*\bdo\b//;
$s =~ s/^\s*{//; $s =~ s/^\s*\{//;
if ($s =~ s/^\s*\\//) { if ($s =~ s/^\s*\\//) {
$continuation = 1; $continuation = 1;
} }
@ -1618,7 +1618,7 @@ sub process {
} }
# check for initialisation to aggregates open brace on the next line # check for initialisation to aggregates open brace on the next line
if ($line =~ /^.\s*{/ && if ($line =~ /^.\s*\{/ &&
$prevline =~ /(?:^|[^=])=\s*$/) { $prevline =~ /(?:^|[^=])=\s*$/) {
ERROR("that open brace { should be on the previous line\n" . $hereprev); ERROR("that open brace { should be on the previous line\n" . $hereprev);
} }
@ -1693,13 +1693,13 @@ sub process {
# function brace can't be on same line, except for #defines of do while, # function brace can't be on same line, except for #defines of do while,
# or if closed on same line # or if closed on same line
if (($line=~/$Type\s*$Ident\(.*\).*\s{/) and if (($line=~/$Type\s*$Ident\(.*\).*\s\{/) and
!($line=~/\#\s*define.*do\s{/) and !($line=~/}/)) { !($line=~/\#\s*define.*do\s\{/) and !($line=~/}/)) {
ERROR("open brace '{' following function declarations go on the next line\n" . $herecurr); ERROR("open brace '{' following function declarations go on the next line\n" . $herecurr);
} }
# open braces for enum, union and struct go on the same line. # open braces for enum, union and struct go on the same line.
if ($line =~ /^.\s*{/ && if ($line =~ /^.\s*\{/ &&
$prevline =~ /^.\s*(?:typedef\s+)?(enum|union|struct)(?:\s+$Ident)?\s*$/) { $prevline =~ /^.\s*(?:typedef\s+)?(enum|union|struct)(?:\s+$Ident)?\s*$/) {
ERROR("open brace '{' following $1 go on the same line\n" . $hereprev); ERROR("open brace '{' following $1 go on the same line\n" . $hereprev);
} }
@ -1853,7 +1853,7 @@ sub process {
# not required when having a single },{ on one line # not required when having a single },{ on one line
} elsif ($op eq ',') { } elsif ($op eq ',') {
if ($ctx !~ /.x[WEC]/ && $cc !~ /^}/ && if ($ctx !~ /.x[WEC]/ && $cc !~ /^}/ &&
($elements[$n] . $elements[$n + 2]) !~ " *}{") { ($elements[$n] . $elements[$n + 2]) !~ " *}\\{") {
ERROR("space required after that '$op' $at\n" . $hereptr); ERROR("space required after that '$op' $at\n" . $hereptr);
} }
@ -1953,8 +1953,8 @@ sub process {
} }
#need space before brace following if, while, etc #need space before brace following if, while, etc
if (($line =~ /\(.*\){/ && $line !~ /\($Type\){/) || if (($line =~ /\(.*\)\{/ && $line !~ /\($Type\)\{/) ||
$line =~ /do{/) { $line =~ /do\{/) {
ERROR("space required before the open brace '{'\n" . $herecurr); ERROR("space required before the open brace '{'\n" . $herecurr);
} }
@ -2268,7 +2268,7 @@ sub process {
my $spaced_block = $block; my $spaced_block = $block;
$spaced_block =~ s/\n\+/ /g; $spaced_block =~ s/\n\+/ /g;
$seen++ if ($spaced_block =~ /^\s*{/); $seen++ if ($spaced_block =~ /^\s*\{/);
print "APW: cond<$cond> block<$block> allowed<$allowed>\n" print "APW: cond<$cond> block<$block> allowed<$allowed>\n"
if $dbg_adv_apw; if $dbg_adv_apw;