From adbee7ecf5097c2aba37548e88e3163b313fdda3 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Fri, 5 Dec 2014 14:04:57 +0000 Subject: multi.c: Fixed compilation warning multi.c:2695: warning: declaration of `exp' shadows a global declaration --- lib/multi.c | 10 +++++----- 1 file 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; -- cgit v1.2.3