From fe8f1512e5a9fa925e8992bc8600ba939e5de14e Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 19 Jul 2022 21:03:48 +0200 Subject: [PATCH] ftp: use a correct expire ID for timer expiry This was an accurate error pointed out by the icc warning: enumerated type mixed with another type Ref: #9179 Closes #9184 --- lib/ftp.c | 3 ++- lib/urldata.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/ftp.c b/lib/ftp.c index e6e9821c9c..0473a8af00 100644 --- a/lib/ftp.c +++ b/lib/ftp.c @@ -518,7 +518,8 @@ static CURLcode AllowServerConnect(struct Curl_easy *data, bool *connected) /* Add timeout to multi handle and break out of the loop */ if(*connected == FALSE) { Curl_expire(data, data->set.accepttimeout > 0 ? - data->set.accepttimeout: DEFAULT_ACCEPT_TIMEOUT, 0); + data->set.accepttimeout: DEFAULT_ACCEPT_TIMEOUT, + EXPIRE_FTP_ACCEPT); } } diff --git a/lib/urldata.h b/lib/urldata.h index 577993c20f..382da3fe29 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -1283,6 +1283,7 @@ typedef enum { EXPIRE_TIMEOUT, EXPIRE_TOOFAST, EXPIRE_QUIC, + EXPIRE_FTP_ACCEPT, EXPIRE_LAST /* not an actual timer, used as a marker only */ } expire_id; -- 2.47.3