From: Steve Holme <steve_holme@hotmail.com>
Date: Fri, 5 Dec 2014 14:04:57 +0000 (+0000)
Subject: multi.c: Fixed compilation warning
X-Git-Tag: curl-7_40_0~212
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=adbee7ecf5097c2aba37548e88e3163b313fdda3;p=curl

multi.c: Fixed compilation warning

multi.c:2695: warning: declaration of `exp' shadows a global declaration
---

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;