mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2024-12-15 06:40:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

checksrc: ignore preprocessor lines

Browse Source 
In order to check the actual code better, checksrc now ignores
everything that look like preprocessor instructions. It also means
that code in macros are now longer checked.

Note that some rules then still don't need to be followed when code is
exactly below a cpp instruction.

Removes two checksrc exceptions we needed previously because of
preprocessor lines being checked.

Reported-by: Marcel Raad
Fixes #7863
Closes #7864
This commit is contained in:
Daniel Stenberg 2021-10-16 13:50:25 +02:00
parent efffa66f65
commit 53418dbc84
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/checksrc.pl
View File

@ -370,7 +370,10 @@ sub scanfile {
my $line = 1;
my $prevl="";
my $l;
my $prevpl="";
my $l = "";
my $prep = 0;
my $prevp = 0;
open(R, "<$file") || die "failed to open $file";
my $incomment=0;
@ -452,6 +455,14 @@ sub scanfile {
# comments
# ------------------------------------------------------------
# prev line was a preprocessor **and** ended with a backslash
if($prep && ($prevpl =~ /\\ *\z/)) {
# this is still a preprocessor line
$prep = 1;
goto preproc;
}
$prep = 0;
# crude attempt to detect // comments without too many false
# positives
if($l =~ /^(([^"\*]*)[^:"]|)\/\//) {
@ -459,6 +470,13 @@ sub scanfile {
$line, length($1), $file, $l, "\/\/ comment");
}
# detect and strip preprocessor directives
if($l =~ /^[ \t]*\#/) {
# preprocessor line
$prep = 1;
goto preproc;
}
my $nostr = nostrings($l);
# check spaces after for/if/while/function call
if($nostr =~ /^(.*)(for|if|while| ([a-zA-Z0-9_]+)) \((.)/) {
@ -676,10 +694,9 @@ sub scanfile {
}
}
# check for open brace first on line but not first column
# only alert if previous line ended with a close paren and wasn't a cpp
# line
if((($prevl =~ /\)\z/) && ($prevl !~ /^ *#/)) && ($l =~ /^( +)\{/)) {
# check for open brace first on line but not first column only alert
# if previous line ended with a close paren and it wasn't a cpp line
if(($prevl =~ /\)\z/) && ($l =~ /^( +)\{/) && !$prevp) {
checkwarn("BRACEPOS",
$line, length($1), $file, $ol, "badly placed open brace");
}
@ -687,11 +704,11 @@ sub scanfile {
# if the previous line starts with if/while/for AND ends with an open
# brace, or an else statement, check that this line is indented $indent
# more steps, if not a cpp line
if($prevl =~ /^( *)((if|while|for)\(.*\{|else)\z/) {
if(!$prevp && ($prevl =~ /^( *)((if|while|for)\(.*\{|else)\z/)) {
my $first = length($1);
# this line has some character besides spaces
if(($l !~ /^ *#/) && ($l =~ /^( *)[^ ]/)) {
if($l =~ /^( *)[^ ]/) {
my $second = length($1);
my $expect = $first+$indent;
if($expect != $second) {
@ -786,9 +803,11 @@ sub scanfile {
print STDERR "L: $l\n";
print STDERR "nostr: $nostr\n";
}
preproc:
$line++;
$prevl = $ol;
$prevp = $prep;
$prevl = $ol if(!$prep);
$prevpl = $ol if($prep);
}
if(!scalar(@copyright)) {

1
tests/libtest/lib557.c
View File

@ -1556,7 +1556,6 @@ static int test_weird_arguments(void)
}
/* DBL_MAX value from Linux */
/* !checksrc! disable PLUSNOSPACE 1 */
#define MAXIMIZE -1.7976931348623157081452E+308
static int test_float_formatting(void)

4
tests/libtest/test.h
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
* Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@ -20,8 +20,6 @@
*
***************************************************************************/
/* !checksrc! disable ASSIGNWITHINCONDITION 14 */
/* Now include the curl_setup.h file from libcurl's private libdir (the source
version, but that might include "curl_config.h" from the build dir so we
need both of them in the include path), so that we get good in-depth