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

checksrc: fix the return() checker

Browse Source 
It would previously wrongly also catch function calls to function names
ending with 'return'

Amended test1185.

Reported-by: Stefan Eissing
Closes #15764
This commit is contained in:
Daniel Stenberg 2024-12-17 11:08:13 +01:00
parent f2adb3b6d7
commit 54c5cb8b7f
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/checksrc.pl
View File

@ -714,7 +714,7 @@ sub scanfile {
} }
# check for "return(" without space # check for "return(" without space
if($l =~ /^(.*)return\(/) { if($l =~ /^(.*\W)return\(/) {
if($1 =~ / *\#/) { if($1 =~ / *\#/) {
# this is a #if, treat it differently # this is a #if, treat it differently
} }

8
tests/data/test1185
View File

@ -46,7 +46,7 @@ if(a == 2){ /* followed by comment */
; ;
} }
func() ; func_return() ;
a = sprintf(buffer, "%s", moo); a = sprintf(buffer, "%s", moo);
@ -120,9 +120,9 @@ void startfunc(int a, int b) {
./%LOGDIR/code1185.c:24:11: warning: missing space after close paren (PARENBRACE) ./%LOGDIR/code1185.c:24:11: warning: missing space after close paren (PARENBRACE)
if(a == 2){ if(a == 2){
^ ^
./%LOGDIR/code1185.c:28:7: warning: no space before semicolon (SPACESEMICOLON) ./%LOGDIR/code1185.c:28:14: warning: no space before semicolon (SPACESEMICOLON)
func() ; func_return() ;
^ ^
./%LOGDIR/code1185.c:30:5: warning: use of sprintf is banned (BANNEDFUNC) ./%LOGDIR/code1185.c:30:5: warning: use of sprintf is banned (BANNEDFUNC)
a = sprintf(buffer, "%s", moo); a = sprintf(buffer, "%s", moo);
^ ^