Commit 93e080cb authored by Steve Holme's avatar Steve Holme
Browse files

http.c: Fixed compilation warnings from features being disabled 

warning: unused variable 'data'
warning: variable 'addcookies' set but not used

...and some very minor coding style policing.
parent 72703aa9

lib/http.c

+11 −5
Original line number Diff line number Diff line
@@ -556,9 +556,11 @@ output_auth_headers(struct connectdata *conn, 
                    const char *path,

                    bool proxy)

{

  struct SessionHandle *data = conn->data;

  const char *auth = NULL;

  CURLcode result = CURLE_OK;

#if defined(USE_SPNEGO) || !defined(CURL_DISABLE_VERBOSE_STRINGS)

  struct SessionHandle *data = conn->data;

#endif

#ifdef USE_SPNEGO

  struct negotiatedata *negdata = proxy?

    &data->state.proxyneg:&data->state.negotiate;
@@ -1722,7 +1724,9 @@ CURLcode Curl_http(struct connectdata *conn, bool *done) 
  const char *ptr;

  const char *request;

  Curl_HttpReq httpreq = data->set.httpreq;

#if !defined(CURL_DISABLE_COOKIES)

  char *addcookies = NULL;

#endif

  curl_off_t included_body = 0;

  const char *httpstring;

  Curl_send_buffer *req_buffer;
@@ -1844,8 +1848,10 @@ CURLcode Curl_http(struct connectdata *conn, bool *done) 
  else

    conn->allocptr.ref = NULL;



#if !defined(CURL_DISABLE_COOKIES)

  if(data->set.str[STRING_COOKIE] && !Curl_checkheaders(conn, "Cookie:"))

    addcookies = data->set.str[STRING_COOKIE];

#endif



  if(!Curl_checkheaders(conn, "Accept-Encoding:") &&

     data->set.str[STRING_ENCODING]) {