diff options
| author | Rikard Falkeborn <rikard.falkeborn@gmail.com> | 2019-01-01 23:04:57 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2019-01-04 23:51:13 +0100 |
| commit | 1e4ec09a26e58ba62c3a3dd3913939d7f4173809 (patch) | |
| tree | 58316ad4805413dfe5e970fbc9ff8a020dbb43a6 /lib/multi.c | |
| parent | fa2d6ba84d7f87148738f3cbccf29016dd324f87 (diff) | |
| download | gnurl-1e4ec09a26e58ba62c3a3dd3913939d7f4173809.tar.gz gnurl-1e4ec09a26e58ba62c3a3dd3913939d7f4173809.tar.bz2 gnurl-1e4ec09a26e58ba62c3a3dd3913939d7f4173809.zip | |
printf: introduce CURL_FORMAT_TIMEDIFF_T
Diffstat (limited to 'lib/multi.c')
| -rw-r--r-- | lib/multi.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lib/multi.c b/lib/multi.c index d8121250c..54d954e65 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2019, 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 @@ -1399,23 +1399,26 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, if(timeout_ms < 0) { /* Handle timed out */ if(data->mstate == CURLM_STATE_WAITRESOLVE) - failf(data, "Resolving timed out after %ld milliseconds", + failf(data, "Resolving timed out after %" CURL_FORMAT_TIMEDIFF_T + " milliseconds", Curl_timediff(now, data->progress.t_startsingle)); else if(data->mstate == CURLM_STATE_WAITCONNECT) - failf(data, "Connection timed out after %ld milliseconds", + failf(data, "Connection timed out after %" CURL_FORMAT_TIMEDIFF_T + " milliseconds", Curl_timediff(now, data->progress.t_startsingle)); else { k = &data->req; if(k->size != -1) { - failf(data, "Operation timed out after %ld milliseconds with %" - CURL_FORMAT_CURL_OFF_T " out of %" + failf(data, "Operation timed out after %" CURL_FORMAT_TIMEDIFF_T + " milliseconds with %" CURL_FORMAT_CURL_OFF_T " out of %" CURL_FORMAT_CURL_OFF_T " bytes received", Curl_timediff(now, data->progress.t_startsingle), k->bytecount, k->size); } else { - failf(data, "Operation timed out after %ld milliseconds with %" - CURL_FORMAT_CURL_OFF_T " bytes received", + failf(data, "Operation timed out after %" CURL_FORMAT_TIMEDIFF_T + " milliseconds with %" CURL_FORMAT_CURL_OFF_T + " bytes received", Curl_timediff(now, data->progress.t_startsingle), k->bytecount); } |