romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-23 12:27:19 +03:00
Code Issues Projects Releases Packages Wiki Activity

time: rename Curl_tvnow to Curl_now

Browse source 
... 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
This commit is contained in:
Daniel Stenberg 2017-10-25 11:59:43 +02:00
parent 1d72b5b891
commit 5d543fe906
23 changed files with 73 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/progress.c
View file

@ -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);