moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

checksrc: check for more malplaced spaces

This commit is contained in:
Daniel Stenberg 2016-04-03 20:28:20 +02:00
parent a981141b19
commit 9d194a1143
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/checksrc.pl
View File

@ -39,8 +39,10 @@ my %warnings = (
'TABS' => 'TAB characters not allowed', 'TABS' => 'TAB characters not allowed',
'TRAILINGSPACE' => 'Trailing white space on the line', 'TRAILINGSPACE' => 'Trailing white space on the line',
'CPPCOMMENTS' => '// comment detected', 'CPPCOMMENTS' => '// comment detected',
'SPACEBEFOREPAREN' => 'bad space before an open parenthesis', 'SPACEBEFOREPAREN' => 'space before an open parenthesis',
'SPACEAFTERPAREN' => 'bad space after open parenthesis', 'SPACEAFTERPAREN' => 'space after open parenthesis',
'SPACEBEFORECLOSE' => 'space before a close parenthesis',
'SPACEBEFORECOMMA' => 'space before a comma',
'RETURNNOSPACE' => 'return without space', 'RETURNNOSPACE' => 'return without space',
'COMMANOSPACE' => 'comma without following space', 'COMMANOSPACE' => 'comma without following space',
'BRACEELSE' => '} else on the same line', 'BRACEELSE' => '} else on the same line',
@ -298,16 +300,26 @@ sub scanfile {
} }
} }
# check spaces after open paren after for/if/while # check spaces after open parentheses
if($l =~ /^(.*)(for|if|while)\( /) { if($l =~ /^(.*[a-z])\( /i) {
if($1 =~ / *\#/) { checkwarn("SPACEAFTERPAREN",
# this is a #if, treat it differently $line, length($1)+1, $file, $l,
} "space after open parenthesis");
else { }
checkwarn("SPACEAFTERPAREN",
$line, length($1)+length($2)+1, $file, $l, # check spaces before close parentheses, unless it was a space or a
"$2 with space first in condition"); # close parenthesis!
} if($l =~ /(.*[^\) ]) \)/) {
checkwarn("SPACEBEFORECLOSE",
$line, length($1)+1, $file, $l,
"space before close parenthesis");
}
# check spaces before comma!
if($l =~ /(.*[^ ]) ,/) {
checkwarn("SPACEBEFORECOMMA",
$line, length($1)+1, $file, $l,
"space before comma");
} }
# check for "return(" without space # check for "return(" without space