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