luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

checksrc: find bad indentation in conditions without open brace

Browse Source 
If the previous line starts with if/while/for AND ends with a closed
parenthesis and there's an equal number of open and closed parentheses
on that line, verify that this line is indented $indent more steps, if
not a cpp line.

Also adjust the fall-out from this fix.

Closes #11054
This commit is contained in:
Daniel Stenberg 2023-04-28 18:07:33 +02:00
parent 31303c34e9
commit 9ce7eee070
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
17 changed files with 49 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scripts/checksrc.pl
View File

@ -765,6 +765,32 @@ sub scanfile {
}
}
# if the previous line starts with if/while/for AND ends with a closed
# parenthesis and there's an equal number of open and closed
# parentheses, check that this line is indented $indent more steps, if
# not a cpp line
elsif(!$prevp && ($prevl =~ /^( *)(if|while|for)(\(.*\))\z/)) {
my $first = length($1);
my $op = $3;
my $cl = $3;
$op =~ s/[^(]//g;
$cl =~ s/[^)]//g;
if(length($op) == length($cl)) {
# this line has some character besides spaces
if($l =~ /^( *)[^ ]/) {
my $second = length($1);
my $expect = $first+$indent;
if($expect != $second) {
my $diff = $second - $first;
checkwarn("INDENTATION", $line, length($1), $file, $ol,
"not indented $indent steps (uses $diff)");
}
}
}
}
# check for 'char * name'
if(($l =~ /(^.*(char|int|long|void|CURL|CURLM|CURLMsg|[cC]url_[A-Za-z_]+|struct [a-zA-Z_]+) *(\*+)) (\w+)/) && ($4 !~ /^(const|volatile)$/)) {
checkwarn("ASTERISKSPACE",