Revert "checksrc: fix regexp for ASSIGNWITHINCONDITION"

This reverts commit ba82673dac3e8d00a76aa5e3779a0cb80e7442af.

Bug: #4683

diff --git a/lib/checksrc.pl b/lib/checksrc.pl
index db9a45dff39950decc80e5ecaf94662a69191aa8..8343645610003f55936128cc7c455c8add9b736e 100755 (executable)
--- 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 070879d94631b9e824ac55c9a28ca0c839e0e605..cad8b378642a52994c282fd86f56a5d97562e413 100644 (file)
--- 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