From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 16 Dec 2019 07:34:14 +0000 (+0100)
Subject: Revert "checksrc: fix regexp for ASSIGNWITHINCONDITION"
X-Git-Tag: curl-7_68_0~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31e637d224afd4f1f219093df6341611d2a0ef75;p=thirdparty%2Fcurl.git

Revert "checksrc: fix regexp for ASSIGNWITHINCONDITION"

This reverts commit ba82673dac3e8d00a76aa5e3779a0cb80e7442af.

Bug: #4683
---

diff --git a/lib/checksrc.pl b/lib/checksrc.pl
index db9a45dff3..8343645610 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 070879d946..cad8b37864 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