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/select.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/select.c')
| -rw-r--r-- | lib/select.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/select.c b/lib/select.c index e21fff1f0..d29868841 100644 --- a/lib/select.c +++ b/lib/select.c @@ -51,7 +51,7 @@ #include "warnless.h" /* Convenience local macros */ -#define ELAPSED_MS() (int)Curl_timediff(Curl_tvnow(), initial_tv) +#define ELAPSED_MS() (int)Curl_timediff(Curl_now(), initial_tv) int Curl_ack_eintr = 0; #define ERROR_NOT_EINTR(error) (Curl_ack_eintr || error != EINTR) @@ -96,7 +96,7 @@ int Curl_wait_ms(int timeout_ms) Sleep(timeout_ms); #else pending_ms = timeout_ms; - initial_tv = Curl_tvnow(); + initial_tv = Curl_now(); do { #if defined(HAVE_POLL_FINE) r = poll(NULL, 0, pending_ms); @@ -184,7 +184,7 @@ int Curl_socket_check(curl_socket_t readfd0, /* two sockets to read from */ if(timeout_ms > 0) { pending_ms = (int)timeout_ms; - initial_tv = Curl_tvnow(); + initial_tv = Curl_now(); } #ifdef HAVE_POLL_FINE @@ -425,7 +425,7 @@ int Curl_poll(struct pollfd ufds[], unsigned int nfds, int timeout_ms) if(timeout_ms > 0) { pending_ms = timeout_ms; - initial_tv = Curl_tvnow(); + initial_tv = Curl_now(); } #ifdef HAVE_POLL_FINE |