diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2017-10-25 11:59:43 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-10-25 18:48:05 +0200 |
| commit | 5d543fe90670c1924fd2c7d6be871b3ad90c438d (patch) | |
| tree | d3d4f945d97ff52ab51c30b278f3d16e74e96883 /lib/asyn-ares.c | |
| parent | 1d72b5b8916e37191108b67ddfada2d1e1e00635 (diff) | |
| download | curl-5d543fe90670c1924fd2c7d6be871b3ad90c438d.tar.gz | |
time: rename Curl_tvnow to Curl_now
... since the 'tv' stood for timeval and this function does not return a
timeval struct anymore.
Also, cleaned up the Curl_timediff*() functions to avoid typecasts and
clean up the descriptive comments.
Closes #2011
Diffstat (limited to 'lib/asyn-ares.c')
| -rw-r--r-- | lib/asyn-ares.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/asyn-ares.c b/lib/asyn-ares.c index 0fbf321b9..27523041e 100644 --- a/lib/asyn-ares.c +++ b/lib/asyn-ares.c @@ -355,7 +355,7 @@ CURLcode Curl_resolver_wait_resolv(struct connectdata *conn, CURLcode result = CURLE_OK; struct Curl_easy *data = conn->data; long timeout; - struct curltime now = Curl_tvnow(); + struct curltime now = Curl_now(); struct Curl_dns_entry *temp_entry; if(entry) @@ -400,7 +400,7 @@ CURLcode Curl_resolver_wait_resolv(struct connectdata *conn, if(Curl_pgrsUpdate(conn)) result = CURLE_ABORTED_BY_CALLBACK; else { - struct curltime now2 = Curl_tvnow(); + struct curltime now2 = Curl_now(); timediff_t timediff = Curl_timediff(now2, now); /* spent time */ if(timediff <= 0) timeout -= 1; /* always deduct at least 1 */ |