Commit 13648f8c authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

struct HandleData is now called struct SingleRequest, and is only for data that 

is inited at the start of the DO action. I removed the Curl_transfer_keeper
struct completely, and I had to move out a few struct members (that had to
be set before DO or used after DONE) to the UrlState struct. The SingleRequest
struct is accessed with SessionHandle->req.

One of the biggest reasons for doing this was the bunch of duplicate struct
members in HandleData and Curl_transfer_keeper since it was really messy to
keep track of two variables with the same name and basically the same purpose!
parent 5b809a31

lib/content_encoding.c

+3 −3
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ exit_zlib(z_stream *z, zlibInitState *zlib_init, CURLcode result) 


static CURLcode

inflate_stream(struct connectdata *conn,

               struct Curl_transfer_keeper *k)

               struct SingleRequest *k)

{

  int allow_restart = 1;

  z_stream *z = &k->z;          /* zlib state structure */
@@ -152,7 +152,7 @@ inflate_stream(struct connectdata *conn, 


CURLcode

Curl_unencode_deflate_write(struct connectdata *conn,

                            struct Curl_transfer_keeper *k,

                            struct SingleRequest *k,

                            ssize_t nread)

{

  z_stream *z = &k->z;          /* zlib state structure */
@@ -265,7 +265,7 @@ static enum { 


CURLcode

Curl_unencode_gzip_write(struct connectdata *conn,

                         struct Curl_transfer_keeper *k,

                         struct SingleRequest *k,

                         ssize_t nread)

{

  z_stream *z = &k->z;          /* zlib state structure */

lib/content_encoding.h

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

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

 *

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

 * Copyright (C) 1998 - 2007, 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
@@ -32,10 +32,10 @@ 
#endif



CURLcode Curl_unencode_deflate_write(struct connectdata *conn,

                                     struct Curl_transfer_keeper *k,

                                     struct SingleRequest *req,

                                     ssize_t nread);



CURLcode

Curl_unencode_gzip_write(struct connectdata *conn,

                         struct Curl_transfer_keeper *k,

                         struct SingleRequest *k,

                         ssize_t nread);

lib/dict.c

+2 −2
Original line number Diff line number Diff line
@@ -155,8 +155,8 @@ static CURLcode Curl_dict(struct connectdata *conn, bool *done) 
  struct SessionHandle *data=conn->data;

  curl_socket_t sockfd = conn->sock[FIRSTSOCKET];



  char *path = data->reqdata.path;

  curl_off_t *bytecount = &data->reqdata.keep.bytecount;

  char *path = data->state.path;

  curl_off_t *bytecount = &data->req.bytecount;



  *done = TRUE; /* unconditionally */

lib/easy.c

+6 −6
Original line number Diff line number Diff line
@@ -528,9 +528,9 @@ void Curl_easy_addmulti(struct SessionHandle *data, 


void Curl_easy_initHandleData(struct SessionHandle *data)

{

    memset(&data->reqdata, 0, sizeof(struct HandleData));

    memset(&data->req, 0, sizeof(struct SingleRequest));



    data->reqdata.maxdownload = -1;

    data->req.maxdownload = -1;

}



/*
@@ -676,11 +676,11 @@ void curl_easy_reset(CURL *curl) 
{

  struct SessionHandle *data = (struct SessionHandle *)curl;



  Curl_safefree(data->reqdata.pathbuffer);

  data->reqdata.pathbuffer=NULL;

  Curl_safefree(data->state.pathbuffer);

  data->state.pathbuffer=NULL;



  Curl_safefree(data->reqdata.proto.generic);

  data->reqdata.proto.generic=NULL;

  Curl_safefree(data->state.proto.generic);

  data->state.proto.generic=NULL;



  /* zero out UserDefined data: */

  Curl_freeset(data);

lib/file.c

+23 −23
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ const struct Curl_handler Curl_handler_file = { 
static CURLcode Curl_file_connect(struct connectdata *conn, bool *done)

{

  struct SessionHandle *data = conn->data;

  char *real_path = curl_easy_unescape(data, data->reqdata.path, 0, NULL);

  char *real_path = curl_easy_unescape(data, data->state.path, 0, NULL);

  struct FILEPROTO *file;

  int fd;

#if defined(WIN32) || defined(MSDOS) || defined(__EMX__)
@@ -142,17 +142,17 @@ static CURLcode Curl_file_connect(struct connectdata *conn, bool *done) 
     sessionhandle, deal with it */

  Curl_reset_reqproto(conn);



  if(!data->reqdata.proto.file) {

  if(!data->state.proto.file) {

    file = (struct FILEPROTO *)calloc(sizeof(struct FILEPROTO), 1);

    if(!file) {

      free(real_path);

      return CURLE_OUT_OF_MEMORY;

    }

    data->reqdata.proto.file = file;

    data->state.proto.file = file;

  }

  else {

    /* file is not a protocol that can deal with "persistancy" */

    file = data->reqdata.proto.file;

    file = data->state.proto.file;

    Curl_safefree(file->freepath);

    if(file->fd != -1)

      close(file->fd);
@@ -200,7 +200,7 @@ static CURLcode Curl_file_connect(struct connectdata *conn, bool *done) 


  file->fd = fd;

  if(!data->set.upload && (fd == -1)) {

    failf(data, "Couldn't open file %s", data->reqdata.path);

    failf(data, "Couldn't open file %s", data->state.path);

    Curl_file_done(conn, CURLE_FILE_COULDNT_READ_FILE, FALSE);

    return CURLE_FILE_COULDNT_READ_FILE;

  }
@@ -212,7 +212,7 @@ static CURLcode Curl_file_connect(struct connectdata *conn, bool *done) 
static CURLcode Curl_file_done(struct connectdata *conn,

                               CURLcode status, bool premature)

{

  struct FILEPROTO *file = conn->data->reqdata.proto.file;

  struct FILEPROTO *file = conn->data->state.proto.file;

  (void)status; /* not used */

  (void)premature; /* not used */

  Curl_safefree(file->freepath);
@@ -231,7 +231,7 @@ static CURLcode Curl_file_done(struct connectdata *conn, 


static CURLcode file_upload(struct connectdata *conn)

{

  struct FILEPROTO *file = conn->data->reqdata.proto.file;

  struct FILEPROTO *file = conn->data->state.proto.file;

  const char *dir = strchr(file->path, DIRSEP);

  FILE *fp;

  CURLcode res=CURLE_OK;
@@ -250,7 +250,7 @@ static CURLcode file_upload(struct connectdata *conn) 
   */

  conn->fread_func = data->set.fread_func;

  conn->fread_in = data->set.in;

  conn->data->reqdata.upload_fromhere = buf;

  conn->data->req.upload_fromhere = buf;



  if(!dir)

    return CURLE_FILE_COULDNT_READ_FILE; /* fix: better error code */
@@ -258,7 +258,7 @@ static CURLcode file_upload(struct connectdata *conn) 
  if(!dir[1])

     return CURLE_FILE_COULDNT_READ_FILE; /* fix: better error code */



  if(data->reqdata.resume_from)

  if(data->state.resume_from)

    fp = fopen( file->path, "ab" );

  else {

    int fd;
@@ -287,14 +287,14 @@ static CURLcode file_upload(struct connectdata *conn) 
    Curl_pgrsSetUploadSize(data, data->set.infilesize);



  /* treat the negative resume offset value as the case of "-" */

  if(data->reqdata.resume_from < 0){

  if(data->state.resume_from < 0){

    if(stat(file->path, &file_stat)){

      fclose(fp);

      failf(data, "Can't get the size of %s", file->path);

      return CURLE_WRITE_ERROR;

    }

    else

      data->reqdata.resume_from = (curl_off_t)file_stat.st_size;

      data->state.resume_from = (curl_off_t)file_stat.st_size;

  }



  while(res == CURLE_OK) {
@@ -309,16 +309,16 @@ static CURLcode file_upload(struct connectdata *conn) 
    nread = (size_t)readcount;



    /*skip bytes before resume point*/

    if(data->reqdata.resume_from) {

      if( (curl_off_t)nread <= data->reqdata.resume_from ) {

        data->reqdata.resume_from -= nread;

    if(data->state.resume_from) {

      if( (curl_off_t)nread <= data->state.resume_from ) {

        data->state.resume_from -= nread;

        nread = 0;

        buf2 = buf;

      }

      else {

        buf2 = buf + data->reqdata.resume_from;

        nread -= data->reqdata.resume_from;

        data->reqdata.resume_from = 0;

        buf2 = buf + data->state.resume_from;

        nread -= data->state.resume_from;

        data->state.resume_from = 0;

      }

    }

    else
@@ -385,7 +385,7 @@ static CURLcode Curl_file(struct connectdata *conn, bool *done) 
    return file_upload(conn);



  /* get the fd from the connection phase */

  fd = conn->data->reqdata.proto.file->fd;

  fd = conn->data->state.proto.file->fd;



  /* VMS: This only works reliable for STREAMLF files */

  if( -1 != fstat(fd, &statbuf)) {
@@ -434,8 +434,8 @@ static CURLcode Curl_file(struct connectdata *conn, bool *done) 
    return result;

  }



  if(data->reqdata.resume_from <= expected_size)

    expected_size -= data->reqdata.resume_from;

  if(data->state.resume_from <= expected_size)

    expected_size -= data->state.resume_from;

  else {

    failf(data, "failed to resume file:// transfer");

    return CURLE_BAD_DOWNLOAD_RESUME;
@@ -451,9 +451,9 @@ static CURLcode Curl_file(struct connectdata *conn, bool *done) 
  if(fstated)

    Curl_pgrsSetDownloadSize(data, expected_size);



  if(data->reqdata.resume_from) {

    if(data->reqdata.resume_from !=

       lseek(fd, data->reqdata.resume_from, SEEK_SET))

  if(data->state.resume_from) {

    if(data->state.resume_from !=

       lseek(fd, data->state.resume_from, SEEK_SET))

      return CURLE_BAD_DOWNLOAD_RESUME;

  }