mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-01-30 14:22:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

ftp: use a correct expire ID for timer expiry

Browse Source 
This was an accurate error pointed out by the icc warning: enumerated
type mixed with another type

Ref: #9179
Closes #9184
This commit is contained in:
Daniel Stenberg 2022-07-19 21:03:48 +02:00
parent 6f037100eb
commit fe8f1512e5
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/ftp.c
View File

@ -518,7 +518,8 @@ static CURLcode AllowServerConnect(struct Curl_easy *data, bool *connected)
/* Add timeout to multi handle and break out of the loop */ /* Add timeout to multi handle and break out of the loop */
if(*connected == FALSE) { if(*connected == FALSE) {
Curl_expire(data, data->set.accepttimeout > 0 ? Curl_expire(data, data->set.accepttimeout > 0 ?
data->set.accepttimeout: DEFAULT_ACCEPT_TIMEOUT, 0); data->set.accepttimeout: DEFAULT_ACCEPT_TIMEOUT,
EXPIRE_FTP_ACCEPT);
} }
} }

1
lib/urldata.h
View File

@ -1283,6 +1283,7 @@ typedef enum {
EXPIRE_TIMEOUT, EXPIRE_TIMEOUT,
EXPIRE_TOOFAST, EXPIRE_TOOFAST,
EXPIRE_QUIC, EXPIRE_QUIC,
EXPIRE_FTP_ACCEPT,
EXPIRE_LAST /* not an actual timer, used as a marker only */ EXPIRE_LAST /* not an actual timer, used as a marker only */
} expire_id; } expire_id;