summaryrefslogtreecommitdiff
path: root/lib/ftp.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2017-10-26 15:24:50 +0200
committerDaniel Stenberg <daniel@haxx.se>2017-10-28 10:40:51 +0200
commit0d85eed3dfbbce18303900385d17f84d939cef00 (patch)
treee86f91d28fd31de4cc625fc1db9e2650f5feef11 /lib/ftp.c
parent9dfc541dd7d11870d51b69c93083b805de30239f (diff)
downloadcurl-0d85eed3dfbbce18303900385d17f84d939cef00.tar.gz
Curl_timeleft: change return type to timediff_t
returning 'time_t' is problematic when that type is unsigned and we return values less than zero to signal "already expired", used in several places in the code. Closes #2021
Diffstat (limited to 'lib/ftp.c')
-rw-r--r--lib/ftp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ftp.c b/lib/ftp.c
index 5c7df2b4c..8042edf48 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -333,10 +333,10 @@ static CURLcode AcceptServerConnect(struct connectdata *conn)
* Curl_pgrsTime(..., TIMER_STARTACCEPT);
*
*/
-static time_t ftp_timeleft_accept(struct Curl_easy *data)
+static timediff_t ftp_timeleft_accept(struct Curl_easy *data)
{
- time_t timeout_ms = DEFAULT_ACCEPT_TIMEOUT;
- time_t other;
+ timediff_t timeout_ms = DEFAULT_ACCEPT_TIMEOUT;
+ timediff_t other;
struct curltime now;
if(data->set.accepttimeout > 0)