aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2014-12-05 14:04:57 +0000
committerSteve Holme <steve_holme@hotmail.com>2014-12-05 14:13:09 +0000
commitadbee7ecf5097c2aba37548e88e3163b313fdda3 (patch)
tree184dfe238a088ffbb292868756282c441155b532 /lib
parentccfa139c71ae6f6c1557a71d4873fad4487c5233 (diff)
multi.c: Fixed compilation warning
multi.c:2695: warning: declaration of `exp' shadows a global declaration
Diffstat (limited to 'lib')
-rw-r--r--lib/multi.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/multi.c b/lib/multi.c
index df413ace4..c0b098fcf 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -2692,24 +2692,24 @@ void Curl_expire(struct SessionHandle *data, long milli)
*/
void Curl_expire_latest(struct SessionHandle *data, long milli)
{
- struct timeval *exp = &data->state.expiretime;
+ struct timeval *expire = &data->state.expiretime;
struct timeval set;
set = Curl_tvnow();
- set.tv_sec += milli/1000;
- set.tv_usec += (milli%1000)*1000;
+ set.tv_sec += milli / 1000;
+ set.tv_usec += (milli % 1000) * 1000;
if(set.tv_usec >= 1000000) {
set.tv_sec++;
set.tv_usec -= 1000000;
}
- if(exp->tv_sec || exp->tv_usec) {
+ if(expire->tv_sec || expire->tv_usec) {
/* This means that the struct is added as a node in the splay tree.
Compare if the new time is earlier, and only remove-old/add-new if it
is. */
- long diff = curlx_tvdiff(set, *exp);
+ long diff = curlx_tvdiff(set, *expire);
if(diff > 0)
/* the new expire time was later than the top time, so just skip this */
return;