diff options
author | Dan Fandrich <dan@coneharvesters.com> | 2007-07-23 18:51:22 +0000 |
---|---|---|
committer | Dan Fandrich <dan@coneharvesters.com> | 2007-07-23 18:51:22 +0000 |
commit | 5ecd56d9646c2adcc70c0369fb6196f62ecc62f4 (patch) | |
tree | a1dc6e5dac022fd7f09217815aa10c2afd0972ae /lib/transfer.c | |
parent | cc44fb1dc8b974d62638c50fb66c31ffa0554a18 (diff) |
Implemented only the parts of Patrick Monnerat's OS/400 patch that renamed
some few internal identifiers to avoid conflicts, which could be useful on
other platforms.
Diffstat (limited to 'lib/transfer.c')
-rw-r--r-- | lib/transfer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/transfer.c b/lib/transfer.c index 655369473..8cf10f20e 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -127,7 +127,7 @@ CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp) /* this function returns a size_t, so we typecast to int to prevent warnings with picky compilers */ - nread = (int)conn->fread(data->reqdata.upload_fromhere, 1, + nread = (int)conn->fread_func(data->reqdata.upload_fromhere, 1, buffersize, conn->fread_in); if(nread == CURL_READFUNC_ABORT) { @@ -237,10 +237,10 @@ CURLcode Curl_readrewind(struct connectdata *conn) (data->set.httpreq == HTTPREQ_POST_FORM)) ; /* do nothing */ else { - if(data->set.ioctl) { + if(data->set.ioctl_func) { curlioerr err; - err = (data->set.ioctl) (data, CURLIOCMD_RESTARTREAD, + err = (data->set.ioctl_func) (data, CURLIOCMD_RESTARTREAD, data->set.ioctl_client); infof(data, "the ioctl callback returned %d\n", (int)err); @@ -254,7 +254,7 @@ CURLcode Curl_readrewind(struct connectdata *conn) /* If no CURLOPT_READFUNCTION is used, we know that we operate on a given FILE * stream and we can actually attempt to rewind that ourself with fseek() */ - if(data->set.fread == (curl_read_callback)fread) { + if(data->set.fread_func == (curl_read_callback)fread) { if(-1 != fseek(data->set.in, 0, SEEK_SET)) /* successful rewind */ return CURLE_OK; |