Commit 8524c04c authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

removed a parameter from the Curl_http_readwrite_headers() prototype to remove 

the need for the struct forward declaration from http.h which caused problems
with gcc 2.96 and quite frankly the parameter wasn't necessary anyway
parent 31630203

lib/http.c

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -3080,11 +3080,11 @@ static CURLcode header_append(struct SessionHandle *data, 
 */

CURLcode Curl_http_readwrite_headers(struct SessionHandle *data,

                                     struct connectdata *conn,

                                     struct SingleRequest *k,

                                     ssize_t *nread,

                                     bool *stop_reading)

{

  CURLcode result;

  struct SingleRequest *k = &data->req;



  /* header line within buffer loop */

  do {

lib/http.h

+0 −3
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 
 ***************************************************************************/

#ifndef CURL_DISABLE_HTTP



struct SingleRequest;



extern const struct Curl_handler Curl_handler_http;



#ifdef USE_SSL
@@ -127,7 +125,6 @@ struct HTTP { 


CURLcode Curl_http_readwrite_headers(struct SessionHandle *data,

                                     struct connectdata *conn,

                                     struct SingleRequest *k,

                                     ssize_t *nread,

                                     bool *stop_reading);

lib/transfer.c

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -441,7 +441,7 @@ static CURLcode readwrite_data(struct SessionHandle *data, 
    if(k->header) {

      /* we are in parse-the-header-mode */

      bool stop_reading = FALSE;

      result = Curl_http_readwrite_headers(data, conn, k, &nread, &stop_reading);

      result = Curl_http_readwrite_headers(data, conn, &nread, &stop_reading);

      if(result)

        return result;

      if(stop_reading)