Commit adbee7ec authored by Steve Holme's avatar Steve Holme
Browse files

multi.c: Fixed compilation warning 

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

lib/multi.c

+5 −5
Original line number Diff line number Diff line
@@ -2692,7 +2692,7 @@ 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;
@@ -2705,11 +2705,11 @@ void Curl_expire_latest(struct SessionHandle *data, long milli) 
    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;