Commit 9dde0b54 authored by Yang Tse's avatar Yang Tse
Browse files

Silence warning: empty body in an if-statement

parent f1343b2f

lib/cookie.h

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ int Curl_cookie_output(struct CookieInfo *, char *); 


#if defined(CURL_DISABLE_HTTP) || defined(CURL_DISABLE_COOKIES)

#define Curl_cookie_list(x) NULL

#define Curl_cookie_loadfiles(x)

#define Curl_cookie_loadfiles(x) do { } while (0)

#else

struct curl_slist *Curl_cookie_list(struct SessionHandle *data);

void Curl_cookie_loadfiles(struct SessionHandle *data);

lib/transfer.c

+2 −1
Original line number Diff line number Diff line
@@ -1714,8 +1714,9 @@ CURLcode Curl_pretransfer(struct SessionHandle *data) 
  data->state.authproxy.want = data->set.proxyauth;



  /* If there is a list of cookie files to read, do it now! */

  if(data->change.cookielist)

  if(data->change.cookielist) {

    Curl_cookie_loadfiles(data);

  }



 /* Allow data->set.use_port to set which port to use. This needs to be

  * disabled for example when we follow Location: headers to URLs using

lib/url.c

+2 −1
Original line number Diff line number Diff line
@@ -228,10 +228,11 @@ CURLcode Curl_close(struct SessionHandle *data) 
#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES)

  Curl_share_lock(data, CURL_LOCK_DATA_COOKIE, CURL_LOCK_ACCESS_SINGLE);

  if(data->set.cookiejar) {

    if(data->change.cookielist)

    if(data->change.cookielist) {

      /* If there is a list of cookie files to read, do it first so that

         we have all the told files read before we write the new jar */

      Curl_cookie_loadfiles(data);

    }



    /* we have a "destination" for all the cookies to get dumped to */

    if(Curl_cookie_output(data->cookies, data->set.cookiejar))