gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-18 20:10:29 +01:00
Code Issues Projects Releases Wiki Activity

checkpatch.pl: Escape curly braces in regexes

Browse Source 
Unescaped curly braces  have been deprecated since Perl 5.26 and are
illegal in Perl 5.30. I copied the relevant lines from the latest kernel
source, so we'll inherit a couple other improvements as well.
This commit is contained in:
Doug Torrance
2020-04-18 17:20:14 -04:00
committed by Carlos R. Mafra
parent c678580621
commit 00a25db9ea
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
checkpatch.pl
View File

@@ -2419,8 +2419,10 @@ 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*$balanced_parens\s*\{/ &&
!($line=~/\#\s*define.*do\s{/) and !($line=~/}/)) { $line !~ /\#\s*define\b.*do\s*\{/ &&
$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);
} }
@@ -2847,12 +2849,12 @@ 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 =~ /\b(?:else|do)\{/) {
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[$linenr - 1] =~ s/^(\+.*(?:do|\))){/$1 {/; $fixed[$linenr - 1] =~ s/^(\+.*(?:do|else|\)))\{/$1 {/;
} }
} }
@@ -3198,7 +3200,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*#\s*define\s+TRACE_(?:SYSTEM|INCLUDE_FILE|INCLUDE_PATH)\b/) $ctx !~ /^.\s*#\s*define\s+TRACE_(?:SYSTEM|INCLUDE_FILE|INCLUDE_PATH)\b/)
{ {
$ctx =~ s/\n*$//; $ctx =~ s/\n*$//;