romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-09 06:54:18 +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

28
lib/timeval.c
View file

@ -24,7 +24,7 @@
#if defined(WIN32) && !defined(MSDOS)
struct curltime Curl_tvnow(void)
struct curltime Curl_now(void)
{
/*
** GetTickCount() is available on _all_ Windows versions from W95 up
@ -48,7 +48,7 @@ struct curltime Curl_tvnow(void)
#elif defined(HAVE_CLOCK_GETTIME_MONOTONIC)
struct curltime Curl_tvnow(void)
struct curltime Curl_now(void)
{
/*
** clock_gettime() is granted to be increased monotonically when the
@ -86,7 +86,7 @@ struct curltime Curl_tvnow(void)
#elif defined(HAVE_GETTIMEOFDAY)
struct curltime Curl_tvnow(void)
struct curltime Curl_now(void)
{
/*
** gettimeofday() is not granted to be increased monotonically, due to
@ -103,7 +103,7 @@ struct curltime Curl_tvnow(void)
#else
struct curltime Curl_tvnow(void)
struct curltime Curl_now(void)
{
/*
** time() returns the value of time in seconds since the Epoch.
@ -125,11 +125,8 @@ struct curltime Curl_tvnow(void)
#endif
/*
* Make sure that the first argument is the more recent time, as otherwise
* we'll get a weird negative time-diff back...
*
* Returns: the time difference in number of milliseconds. For large diffs it
* returns 0x7fffffff on 32bit time_t systems.
* Returns: time difference in number of milliseconds. For too large diffs it
* returns max value.
*
* @unittest: 1323
*/
@ -140,16 +137,12 @@ timediff_t Curl_timediff(struct curltime newer, struct curltime older)
return TIME_MAX;
else if(diff <= (TIME_MIN/1000))
return TIME_MIN;
return (timediff_t)(newer.tv_sec-older.tv_sec)*1000+
(timediff_t)(newer.tv_usec-older.tv_usec)/1000;
return diff * 1000 + (newer.tv_usec-older.tv_usec)/1000;
}
/*
* Make sure that the first argument is the more recent time, as otherwise
* we'll get a weird negative time-diff back...
*
* Returns: the time difference in number of microseconds. For too large diffs
* it returns max value.
* Returns: time difference in number of microseconds. For too large diffs it
* returns max value.
*/
timediff_t Curl_timediff_us(struct curltime newer, struct curltime older)
{
@ -158,6 +151,5 @@ timediff_t Curl_timediff_us(struct curltime newer, struct curltime older)
return TIME_MAX;
else if(diff <= (TIME_MIN/1000000))
return TIME_MIN;
return (timediff_t)(newer.tv_sec-older.tv_sec)*1000000+
(timediff_t)(newer.tv_usec-older.tv_usec);
return diff * 1000000 + newer.tv_usec-older.tv_usec;
}