diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2019-12-16 08:34:14 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2019-12-16 22:46:35 +0100 |
| commit | 31e637d224afd4f1f219093df6341611d2a0ef75 (patch) | |
| tree | 62a5ba49f1db991da187883921e407d39a387fb8 | |
| parent | 3ab45a9876db2bc1c612f69c2133b3161b4a7c37 (diff) | |
| download | curl-31e637d224afd4f1f219093df6341611d2a0ef75.tar.gz | |
Revert "checksrc: fix regexp for ASSIGNWITHINCONDITION"
This reverts commit ba82673dac3e8d00a76aa5e3779a0cb80e7442af.
Bug: #4683
| -rwxr-xr-x | lib/checksrc.pl | 2 | ||||
| -rw-r--r-- | lib/vssh/libssh.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/checksrc.pl b/lib/checksrc.pl index db9a45dff..834364561 100755 --- a/lib/checksrc.pl +++ b/lib/checksrc.pl @@ -457,7 +457,7 @@ sub scanfile { } } - if($nostr =~ /^((.*)(if) *\()(.*)\) [{\n]/) { + if($nostr =~ /^((.*)(if) *\()(.*)\)/) { my $pos = length($1); if($4 =~ / = /) { checkwarn("ASSIGNWITHINCONDITION", diff --git a/lib/vssh/libssh.c b/lib/vssh/libssh.c index 070879d94..cad8b3786 100644 --- a/lib/vssh/libssh.c +++ b/lib/vssh/libssh.c @@ -97,6 +97,7 @@ /* A recent macro provided by libssh. Or make our own. */ #ifndef SSH_STRING_FREE_CHAR +/* !checksrc! disable ASSIGNWITHINCONDITION 1 */ #define SSH_STRING_FREE_CHAR(x) \ do { if((x) != NULL) { ssh_string_free_char(x); x = NULL; } } while(0) #endif |