mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-02-03 05:12:51 +00:00
scripts/checkpatch.pl: Fix deprecation warnings
In perl version v5.22, use of unescaped opening braces is deprecated Signed-off-by: Javier Domingo Cansino <javierdo1@gmail.com> SVN-Revision: 47342
This commit is contained in:
parent
ed30ca8e39
commit
0aeb0ae938
@ -2354,8 +2354,8 @@ 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",
|
ERROR("OPEN_BRACE",
|
||||||
"open brace '{' following function declarations go on the next line\n" . $herecurr);
|
"open brace '{' following function declarations go on the next line\n" . $herecurr);
|
||||||
}
|
}
|
||||||
@ -2623,8 +2623,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("SPACING",
|
ERROR("SPACING",
|
||||||
"space required before the open brace '{'\n" . $herecurr);
|
"space required before the open brace '{'\n" . $herecurr);
|
||||||
}
|
}
|
||||||
@ -2914,7 +2914,7 @@ sub process {
|
|||||||
$dstat !~ /^for\s*$Constant$/ && # for (...)
|
$dstat !~ /^for\s*$Constant$/ && # for (...)
|
||||||
$dstat !~ /^for\s*$Constant\s+(?:$Ident|-?$Constant)$/ && # for (...) bar()
|
$dstat !~ /^for\s*$Constant\s+(?:$Ident|-?$Constant)$/ && # for (...) bar()
|
||||||
$dstat !~ /^do\s*{/ && # do {...
|
$dstat !~ /^do\s*{/ && # do {...
|
||||||
$dstat !~ /^\({/) # ({...
|
$dstat !~ /^\(\{/) # ({...
|
||||||
{
|
{
|
||||||
$ctx =~ s/\n*$//;
|
$ctx =~ s/\n*$//;
|
||||||
my $herectx = $here . "\n";
|
my $herectx = $here . "\n";
|
||||||
|
Loading…
Reference in New Issue
Block a user