]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
ftp: use a correct expire ID for timer expiry
authorDaniel Stenberg <daniel@haxx.se>
Tue, 19 Jul 2022 19:03:48 +0000 (21:03 +0200)
committerDaniel Stenberg <daniel@haxx.se>
Tue, 19 Jul 2022 22:50:19 +0000 (00:50 +0200)
This was an accurate error pointed out by the icc warning: enumerated
type mixed with another type

Ref: #9179
Closes #9184

lib/ftp.c
lib/urldata.h

index e6e9821c9cad4268fc6094332b7a5c49fbe7c287..0473a8af008a554e3e51eb8d760cff1b4e13b263 100644 (file)
--- 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);
     }
   }
 
index 577993c20f25215bf69121245ef2bae2f83b9dd8..382da3fe2999e88caef46bc5a1d8923ecb8980a5 100644 (file)
@@ -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;