diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2020-05-29 00:08:03 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2020-05-30 23:10:57 +0200 |
| commit | 842f73de58f38bd6e285e08bbd1adb6c17cb62cd (patch) | |
| tree | c28cb0b85895d71f19373ab732736a5fa671ebff /lib/vtls/mesalink.c | |
| parent | fc55c723c4ecebabf12c32caddd0f9bc9d169ed4 (diff) | |
timeouts: change millisecond timeouts to timediff_t from time_t
For millisecond timers we like timediff_t better. Also, time_t can be
unsigned so returning a negative value doesn't work then.
Closes #5479
Diffstat (limited to 'lib/vtls/mesalink.c')
| -rw-r--r-- | lib/vtls/mesalink.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/vtls/mesalink.c b/lib/vtls/mesalink.c index cab1e390b..7132bdfd2 100644 --- a/lib/vtls/mesalink.c +++ b/lib/vtls/mesalink.c @@ -6,7 +6,7 @@ * \___|\___/|_| \_\_____| * * Copyright (C) 2017 - 2018, Yiming Jing, <jingyiming@baidu.com> - * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -542,9 +542,8 @@ mesalink_connect_common(struct connectdata *conn, int sockindex, ? sockfd : CURL_SOCKET_BAD; - what = Curl_socket_check( - readfd, CURL_SOCKET_BAD, writefd, - nonblocking ? 0 : (time_t)timeout_ms); + what = Curl_socket_check(readfd, CURL_SOCKET_BAD, writefd, + nonblocking ? 0 : timeout_ms); if(what < 0) { /* fatal error */ failf(data, "select/poll on SSL socket, errno: %d", SOCKERRNO); |