aboutsummaryrefslogtreecommitdiff
path: root/lib/ftp.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2002-12-09 15:37:54 +0000
committerDaniel Stenberg <daniel@haxx.se>2002-12-09 15:37:54 +0000
commit4bcc866c52d5d5eaae18bda4b2afad8014b23683 (patch)
tree807392a4a1cd99d6d89d5aa6ea0dd27448328287 /lib/ftp.c
parentc65e088cafb1fe46000270c8e13c31f5dc909ed3 (diff)
The fread() callback pointer and associated pointer is now stored in the
connectdata struct instead, and is no longer modified within the 'set' struct as previously (which was a really BAAAD thing).
Diffstat (limited to 'lib/ftp.c')
-rw-r--r--lib/ftp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ftp.c b/lib/ftp.c
index 504af23ee..121b3de49 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -1591,8 +1591,8 @@ CURLcode Curl_ftp_nextconnect(struct connectdata *conn)
readthisamountnow = BUFSIZE;
actuallyread =
- data->set.fread(data->state.buffer, 1, readthisamountnow,
- data->set.in);
+ conn->fread(data->state.buffer, 1, readthisamountnow,
+ conn->fread_in);
passed += actuallyread;
if(actuallyread != readthisamountnow) {
@@ -1623,7 +1623,7 @@ CURLcode Curl_ftp_nextconnect(struct connectdata *conn)
}
}
- /* Send everything on data->set.in to the socket */
+ /* Send everything on data->state.in to the socket */
if(data->set.ftp_append) {
/* we append onto the file instead of rewriting it */
FTPSENDF(conn, "APPE %s", ftp->file);