[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 22/24] checkpatch: Escape left braces in regex
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 22/24] checkpatch: Escape left braces in regex |
Date: |
Wed, 16 Sep 2015 14:29:53 +0200 |
From: Fam Zheng <address@hidden>
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 <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
scripts/checkpatch.pl | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 4ac00a9..574334b 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -582,7 +582,7 @@ sub statement_block_size {
my ($stmt) = @_;
$stmt =~ s/(^|\n)./$1/g;
- $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
# opening brace there)
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) {
ERROR("that open brace { should be on the
previous line\n" .
"$here\n$ctx\n$rawlines[$ctx_ln -
1]\n");
@@ -1519,7 +1519,7 @@ sub process {
my $continuation = 0;
my $check = 0;
$s =~ s/^.*\bdo\b//;
- $s =~ s/^\s*{//;
+ $s =~ s/^\s*\{//;
if ($s =~ s/^\s*\\//) {
$continuation = 1;
}
@@ -1618,7 +1618,7 @@ sub process {
}
# check for initialisation to aggregates open brace on the next line
- if ($line =~ /^.\s*{/ &&
+ if ($line =~ /^.\s*\{/ &&
$prevline =~ /(?:^|[^=])=\s*$/) {
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,
# 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 '{' following function declarations
go on the next line\n" . $herecurr);
}
# 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*$/) {
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
} elsif ($op eq ',') {
if ($ctx !~ /.x[WEC]/ && $cc !~ /^}/ &&
- ($elements[$n] . $elements[$n +
2]) !~ " *}{") {
+ ($elements[$n] . $elements[$n +
2]) !~ " *}\\{") {
ERROR("space required after
that '$op' $at\n" . $hereptr);
}
@@ -1953,8 +1953,8 @@ sub process {
}
#need space before brace following if, while, etc
- if (($line =~ /\(.*\){/ && $line !~ /\($Type\){/) ||
- $line =~ /do{/) {
+ if (($line =~ /\(.*\)\{/ && $line !~ /\($Type\)\{/) ||
+ $line =~ /do\{/) {
ERROR("space required before the open brace '{'\n" .
$herecurr);
}
@@ -2268,7 +2268,7 @@ sub process {
my $spaced_block = $block;
$spaced_block =~ s/\n\+/ /g;
- $seen++ if ($spaced_block =~ /^\s*{/);
+ $seen++ if ($spaced_block =~ /^\s*\{/);
print "APW: cond<$cond> block<$block>
allowed<$allowed>\n"
if $dbg_adv_apw;
--
2.5.0
- Re: [Qemu-devel] [PULL 16/24] tcg: Move tci_tb_ptr to -common, (continued)
- [Qemu-devel] [PULL 15/24] tcg: split tcg_op_defs to -common, Paolo Bonzini, 2015/09/16
- [Qemu-devel] [PULL 09/24] monitor: remove target-specific code from monitor.c, Paolo Bonzini, 2015/09/16
- [Qemu-devel] [PULL 18/24] cputlb: move CPU_LOOP() for tlb_reset() to exec.c, Paolo Bonzini, 2015/09/16
- [Qemu-devel] [PULL 17/24] translate: move real_host_page setting to -common, Paolo Bonzini, 2015/09/16
- [Qemu-devel] [PULL 19/24] cputlb: Change tlb_set_dirty() arg to cpu, Paolo Bonzini, 2015/09/16
- [Qemu-devel] [PULL 21/24] monitor: uninclude cpu_ldst, Paolo Bonzini, 2015/09/16
- [Qemu-devel] [PULL 24/24] Revert "rcu: init rcu_registry_lock after fork", Paolo Bonzini, 2015/09/16
- [Qemu-devel] [PULL 22/24] checkpatch: Escape left braces in regex,
Paolo Bonzini <=
- [Qemu-devel] [PULL 23/24] nbd: release exp->blk after all clients are closed, Paolo Bonzini, 2015/09/16
- [Qemu-devel] [PULL 20/24] include/exec: Move cputlb exec.c defs out, Paolo Bonzini, 2015/09/16
- Re: [Qemu-devel] [PULL 00/24] Misc patches for 2015-09-16, Eric Blake, 2015/09/16
- Re: [Qemu-devel] [PULL 00/24] Misc patches for 2015-09-16, Peter Maydell, 2015/09/16