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/progress.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/progress.c')
-rw-r--r-- | lib/progress.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/progress.c b/lib/progress.c index 03ab43c1c..72c518a14 100644 --- a/lib/progress.c +++ b/lib/progress.c @@ -161,7 +161,7 @@ void Curl_pgrsResetTransferSizes(struct Curl_easy *data) */ void Curl_pgrsTime(struct Curl_easy *data, timerid timer) { - struct curltime now = Curl_tvnow(); + struct curltime now = Curl_now(); time_t *delta = NULL; switch(timer) { @@ -226,7 +226,7 @@ void Curl_pgrsTime(struct Curl_easy *data, timerid timer) void Curl_pgrsStartNow(struct Curl_easy *data) { data->progress.speeder_c = 0; /* reset the progress meter display */ - data->progress.start = Curl_tvnow(); + data->progress.start = Curl_now(); data->progress.is_t_startransfer_set = false; data->progress.ul_limit_start.tv_sec = 0; data->progress.ul_limit_start.tv_usec = 0; @@ -285,7 +285,7 @@ long Curl_pgrsLimitWaitTime(curl_off_t cursize, void Curl_pgrsSetDownloadCounter(struct Curl_easy *data, curl_off_t size) { - struct curltime now = Curl_tvnow(); + struct curltime now = Curl_now(); data->progress.downloaded = size; @@ -303,7 +303,7 @@ void Curl_pgrsSetDownloadCounter(struct Curl_easy *data, curl_off_t size) void Curl_pgrsSetUploadCounter(struct Curl_easy *data, curl_off_t size) { - struct curltime now = Curl_tvnow(); + struct curltime now = Curl_now(); data->progress.uploaded = size; @@ -370,7 +370,7 @@ int Curl_pgrsUpdate(struct connectdata *conn) curl_off_t total_estimate; bool shownow = FALSE; - now = Curl_tvnow(); /* what time is it */ + now = Curl_now(); /* what time is it */ /* The time spent so far (from the start) */ data->progress.timespent = Curl_timediff_us(now, data->progress.start); |