leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

checkpatch: silence perl 5.26.0 unescaped left brace warnings

Browse Source 
commit 8d81ae05d0 upstream.

As of perl 5, version 26, subversion 0 (v5.26.0) some new warnings have
occurred when running checkpatch.

Unescaped left brace in regex is deprecated here (and will be fatal in
Perl 5.30), passed through in regex; marked by <-- HERE in m/^(.\s*){
<-- HERE \s*/ at scripts/checkpatch.pl line 3544.

Unescaped left brace in regex is deprecated here (and will be fatal in
Perl 5.30), passed through in regex; marked by <-- HERE in m/^(.\s*){
<-- HERE \s*/ at scripts/checkpatch.pl line 3885.

Unescaped left brace in regex is deprecated here (and will be fatal in
Perl 5.30), passed through in regex; marked by <-- HERE in
m/^(\+.*(?:do|\))){ <-- HERE / at scripts/checkpatch.pl line 4374.

It seems perfectly reasonable to do as the warning suggests and simply
escape the left brace in these three locations.

Link: http://lkml.kernel.org/r/20170607060135.17384-1-cyrilbur@gmail.com
Signed-off-by: Cyril Bur <cyrilbur@gmail.com>
Acked-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Cyril Bur
2017-07-10 15:52:21 -07:00
committed by Greg Kroah-Hartman
parent 68b0f5d85b
commit 4544e9ebef
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/checkpatch.pl
View File

@@ -3252,7 +3252,7 @@ sub process {
$fixedline =~ s/\s*=\s*$/ = {/; $fixedline =~ s/\s*=\s*$/ = {/;
fix_insert_line($fixlinenr, $fixedline); fix_insert_line($fixlinenr, $fixedline);
$fixedline = $line; $fixedline = $line;
$fixedline =~ s/^(.\s*){\s*/$1/; $fixedline =~ s/^(.\s*)\{\s*/$1/;
fix_insert_line($fixlinenr, $fixedline); fix_insert_line($fixlinenr, $fixedline);
} }
} }
@@ -3602,7 +3602,7 @@ sub process {
my $fixedline = rtrim($prevrawline) . " {"; my $fixedline = rtrim($prevrawline) . " {";
fix_insert_line($fixlinenr, $fixedline); fix_insert_line($fixlinenr, $fixedline);
$fixedline = $rawline; $fixedline = $rawline;
$fixedline =~ s/^(.\s*){\s*/$1\t/; $fixedline =~ s/^(.\s*)\{\s*/$1\t/;
if ($fixedline !~ /^\+\s*$/) { if ($fixedline !~ /^\+\s*$/) {
fix_insert_line($fixlinenr, $fixedline); fix_insert_line($fixlinenr, $fixedline);
} }
@@ -4091,7 +4091,7 @@ sub process {
if (ERROR("SPACING", if (ERROR("SPACING",
"space required before the open brace '{'\n" . $herecurr) && "space required before the open brace '{'\n" . $herecurr) &&
$fix) { $fix) {
$fixed[$fixlinenr] =~ s/^(\+.*(?:do|\))){/$1 {/; $fixed[$fixlinenr] =~ s/^(\+.*(?:do|\)))\{/$1 {/;
} }
} }