mirror of
https://github.com/nilfs-dev/nilfs-utils.git
synced 2026-01-26 13:43:15 +00:00
checkpatch: fix perl errors due to unescaped left braces in regex
Fix error in checkpatch.pl errors due to use of deprecated unescaped left braces in perl regular expressions. Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
This commit is contained in:
parent
e0285eb587
commit
e80a5bcbab
@ -3023,7 +3023,7 @@ sub process {
|
||||
$fixedline =~ s/\s*=\s*$/ = {/;
|
||||
fix_insert_line($fixlinenr, $fixedline);
|
||||
$fixedline = $line;
|
||||
$fixedline =~ s/^(.\s*){\s*/$1/;
|
||||
$fixedline =~ s/^(.\s*)\{\s*/$1/;
|
||||
fix_insert_line($fixlinenr, $fixedline);
|
||||
}
|
||||
}
|
||||
@ -3312,7 +3312,7 @@ 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=~/}/)) {
|
||||
!($line=~/\#\s*define.*do\s\{/) and !($line=~/}/)) {
|
||||
if (ERROR("OPEN_BRACE",
|
||||
"open brace '{' following function declarations go on the next line\n" . $herecurr) &&
|
||||
$fix) {
|
||||
@ -3340,7 +3340,7 @@ sub process {
|
||||
my $fixedline = rtrim($prevrawline) . " {";
|
||||
fix_insert_line($fixlinenr, $fixedline);
|
||||
$fixedline = $rawline;
|
||||
$fixedline =~ s/^(.\s*){\s*/$1\t/;
|
||||
$fixedline =~ s/^(.\s*)\{\s*/$1\t/;
|
||||
if ($fixedline !~ /^\+\s*$/) {
|
||||
fix_insert_line($fixlinenr, $fixedline);
|
||||
}
|
||||
@ -3816,12 +3816,12 @@ 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) {
|
||||
$fixed[$fixlinenr] =~ s/^(\+.*(?:do|\))){/$1 {/;
|
||||
$fixed[$fixlinenr] =~ s/^(\+.*(?:do|\)))\{/$1 \{/;
|
||||
}
|
||||
}
|
||||
|
||||
@ -4259,8 +4259,8 @@ sub process {
|
||||
$dstat !~ /^do\s*$Constant\s*while\s*$Constant;?$/ && # do {...} while (...); // do {...} while (...)
|
||||
$dstat !~ /^for\s*$Constant$/ && # for (...)
|
||||
$dstat !~ /^for\s*$Constant\s+(?:$Ident|-?$Constant)$/ && # for (...) bar()
|
||||
$dstat !~ /^do\s*{/ && # do {...
|
||||
$dstat !~ /^\({/ && # ({...
|
||||
$dstat !~ /^do\s*\{/ && # do {...
|
||||
$dstat !~ /^\(\{/ && # ({...
|
||||
$ctx !~ /^.\s*#\s*define\s+TRACE_(?:SYSTEM|INCLUDE_FILE|INCLUDE_PATH)\b/)
|
||||
{
|
||||
$ctx =~ s/\n*$//;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user