summaryrefslogtreecommitdiff
path: root/lib/easy.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2017-10-25 11:59:43 +0200
committerDaniel Stenberg <daniel@haxx.se>2017-10-25 18:48:05 +0200
commit5d543fe90670c1924fd2c7d6be871b3ad90c438d (patch)
treed3d4f945d97ff52ab51c30b278f3d16e74e96883 /lib/easy.c
parent1d72b5b8916e37191108b67ddfada2d1e1e00635 (diff)
downloadcurl-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/easy.c')
-rw-r--r--lib/easy.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/easy.c b/lib/easy.c
index 212d6f3da..018611927 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -586,12 +586,12 @@ static CURLcode wait_or_timeout(struct Curl_multi *multi, struct events *ev)
}
/* get the time stamp to use to figure out how long poll takes */
- before = Curl_tvnow();
+ before = Curl_now();
/* wait for activity or timeout */
pollrc = Curl_poll(fds, numfds, (int)ev->ms);
- after = Curl_tvnow();
+ after = Curl_now();
ev->msbump = FALSE; /* reset here */
@@ -680,12 +680,12 @@ static CURLcode easy_transfer(struct Curl_multi *multi)
int still_running = 0;
int rc;
- before = Curl_tvnow();
+ before = Curl_now();
mcode = curl_multi_wait(multi, NULL, 0, 1000, &rc);
if(!mcode) {
if(!rc) {
- struct curltime after = Curl_tvnow();
+ struct curltime after = Curl_now();
/* If it returns without any filedescriptor instantly, we need to
avoid busy-looping during periods where it has nothing particular