summaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2015-11-30 13:35:23 +0100
committerNiels de Vos <ndevos@redhat.com>2016-01-10 02:58:42 -0800
commitbece36718c01b55a659aa1eb32728e5626cde9fe (patch)
tree8287cc6821a3c07e6ed05473b81c6b25b115c997 /extras
parent0f251fd517d2ed67330e11d56e9e64cca8390b35 (diff)
extras: fix deprecation warining in checkpatch.pl
Left braces in patterns need to be escaped. Otherwise, for perl >= 5.16, we get a warning: "Unescaped left brace in regex is deprecated, passed through in regex;" This patch fixes the relevant braces. Hence perl -c ./examples/checkpatch.pl is clean again. > Change-Id: I938c9c262239f53de57d30a2cff7030f22e63dc1 > BUG: 1198849 > Signed-off-by: Michael Adam <obnox@samba.org> > Reviewed-on: http://review.gluster.org/12828 > Reviewed-by: Anoop C S <anoopcs@redhat.com> > Reviewed-by: Niels de Vos <ndevos@redhat.com> > Tested-by: NetBSD Build System <jenkins@build.gluster.org> > Tested-by: Gluster Build System <jenkins@build.gluster.com> (cherry picked from commit 2e9376a2f1b992d3649dd1d5a8e844b4c031ef3c) Change-Id: I2a38e8e2d0652af519bf139ec046edc42c5e5356 BUG: 1290534 Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-on: http://review.gluster.org/12942 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Anoop C S <anoopcs@redhat.com> Reviewed-by: Raghavendra Talur <rtalur@redhat.com> Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'extras')
-rwxr-xr-xextras/checkpatch.pl10
1 files changed, 5 insertions, 5 deletions
diff --git a/extras/checkpatch.pl b/extras/checkpatch.pl
index 5a31425..5a4e018 100755
--- a/extras/checkpatch.pl
+++ b/extras/checkpatch.pl
@@ -2702,8 +2702,8 @@ 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",
"open brace '{' following function declarations go on the next line\n" . $herecurr);
}
@@ -3104,8 +3104,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) {
@@ -3493,7 +3493,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*$//;