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

checksrc: improve the SPACESEMICOLON error message

Browse Source 
and adjust the MULTISPACE one to use plural

Closes #7866
This commit is contained in:
Daniel Stenberg 2021-10-18 10:46:04 +02:00
parent bffe90cf2e
commit 3da8b4dabf
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/checksrc.pl
View File

@ -547,7 +547,6 @@ sub scanfile {
}
elsif($even && $postparen &&
($postparen !~ /^ *$/) && ($postparen !~ /^ *[,{&|\\]+/)) {
print STDERR "5: '$postparen'\n";
checkwarn("ONELINECONDITION",
$line, length($l)-length($postparen), $file, $l,
"conditional block on the same line");
@ -648,7 +647,7 @@ sub scanfile {
# check for space before the semicolon last in a line
if($l =~ /^(.*[^ ].*) ;$/) {
checkwarn("SPACESEMICOLON",
$line, length($1), $file, $ol, "space before last semicolon");
$line, length($1), $file, $ol, "no space before semicolon");
}
# scan for use of banned functions
@ -706,7 +705,6 @@ sub scanfile {
# more steps, if not a cpp line
if(!$prevp && ($prevl =~ /^( *)((if|while|for)\(.*\{|else)\z/)) {
my $first = length($1);
# this line has some character besides spaces
if($l =~ /^( *)[^ ]/) {
my $second = length($1);
@ -799,9 +797,7 @@ sub scanfile {
$nostr =~ /^(.*(\S)) + [{?]/i) {
checkwarn("MULTISPACE",
$line, length($1)+1, $file, $ol,
"multiple space");
print STDERR "L: $l\n";
print STDERR "nostr: $nostr\n";
"multiple spaces");
}
preproc:
$line++;