From a50c3d7fa0ba4390ac05a290836f076909d2954d Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 19 Sep 2019 09:16:41 +0200 Subject: ftp: Expression 'ftpc->wait_data_conn' is always true Fixes warning detected by PVS-Studio Fixes #4374 --- lib/ftp.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/ftp.c b/lib/ftp.c index 59ca13ef1..a4a37c9af 100644 --- a/lib/ftp.c +++ b/lib/ftp.c @@ -3530,14 +3530,13 @@ static CURLcode ftp_do_more(struct connectdata *conn, int *completep) /* if we got an error or if we don't wait for a data connection return immediately */ - if(result || (ftpc->wait_data_conn != TRUE)) + if(result || !ftpc->wait_data_conn) return result; - if(ftpc->wait_data_conn) - /* if we reach the end of the FTP state machine here, *complete will be - TRUE but so is ftpc->wait_data_conn, which says we need to wait for - the data connection and therefore we're not actually complete */ - *completep = 0; + /* if we reach the end of the FTP state machine here, *complete will be + TRUE but so is ftpc->wait_data_conn, which says we need to wait for the + data connection and therefore we're not actually complete */ + *completep = 0; } if(ftp->transfer <= FTPTRANSFER_INFO) { -- cgit v1.2.1