Transfer is now Curl_Tranfer() and transfer.h is used instead of highlevel.h

and download.h
This commit is contained in:
Daniel Stenberg 2001-01-17 13:23:01 +00:00
parent f2f11be8ba
commit ae0a6835bd
6 changed files with 15 additions and 15 deletions

View File

@ -71,7 +71,7 @@
#include "urldata.h" #include "urldata.h"
#include <curl/curl.h> #include <curl/curl.h>
#include "download.h" #include "transfer.h"
#include "sendf.h" #include "sendf.h"
#include "progress.h" #include "progress.h"
@ -154,7 +154,7 @@ CURLcode Curl_dict(struct connectdata *conn)
word word
); );
result = Transfer(conn, data->firstsocket, -1, FALSE, bytecount, result = Curl_Transfer(conn, data->firstsocket, -1, FALSE, bytecount,
-1, NULL); /* no upload */ -1, NULL); /* no upload */
if(result) if(result)
@ -202,7 +202,7 @@ CURLcode Curl_dict(struct connectdata *conn)
word word
); );
result = Transfer(conn, data->firstsocket, -1, FALSE, bytecount, result = Curl_Transfer(conn, data->firstsocket, -1, FALSE, bytecount,
-1, NULL); /* no upload */ -1, NULL); /* no upload */
if(result) if(result)
@ -226,7 +226,7 @@ CURLcode Curl_dict(struct connectdata *conn)
"QUIT\n", "QUIT\n",
ppath); ppath);
result = Transfer(conn, data->firstsocket, -1, FALSE, bytecount, result = Curl_Transfer(conn, data->firstsocket, -1, FALSE, bytecount,
-1, NULL); -1, NULL);
if(result) if(result)

View File

@ -72,7 +72,7 @@
#include "urldata.h" #include "urldata.h"
#include <curl/curl.h> #include <curl/curl.h>
#include "highlevel.h" #include "transfer.h"
#include <curl/types.h> #include <curl/types.h>
#define _MPRINTF_REPLACE /* use our functions only */ #define _MPRINTF_REPLACE /* use our functions only */

View File

@ -67,7 +67,7 @@
#include "if2ip.h" #include "if2ip.h"
#include "hostip.h" #include "hostip.h"
#include "progress.h" #include "progress.h"
#include "download.h" #include "transfer.h"
#include "escape.h" #include "escape.h"
#include "http.h" /* for HTTP proxy tunnel stuff */ #include "http.h" /* for HTTP proxy tunnel stuff */
#include "ftp.h" #include "ftp.h"
@ -1110,7 +1110,7 @@ CURLcode _ftp(struct connectdata *conn)
Curl_pgrsSetUploadSize(data, data->infilesize); Curl_pgrsSetUploadSize(data, data->infilesize);
result = Transfer(conn, -1, -1, FALSE, NULL, /* no download */ result = Curl_Transfer(conn, -1, -1, FALSE, NULL, /* no download */
data->secondarysocket, bytecountp); data->secondarysocket, bytecountp);
if(result) if(result)
return result; return result;
@ -1339,7 +1339,7 @@ CURLcode _ftp(struct connectdata *conn)
infof(data, "Getting file with size: %d\n", size); infof(data, "Getting file with size: %d\n", size);
/* FTP download: */ /* FTP download: */
result=Transfer(conn, data->secondarysocket, size, FALSE, result=Curl_Transfer(conn, data->secondarysocket, size, FALSE,
bytecountp, bytecountp,
-1, NULL); /* no upload here */ -1, NULL); /* no upload here */
if(result) if(result)

View File

@ -87,7 +87,7 @@
#include "urldata.h" #include "urldata.h"
#include <curl/curl.h> #include <curl/curl.h>
#include "download.h" #include "transfer.h"
#include "sendf.h" #include "sendf.h"
#include "formdata.h" #include "formdata.h"
#include "progress.h" #include "progress.h"
@ -616,7 +616,7 @@ CURLcode Curl_http(struct connectdata *conn)
data->request_size = data->request_size =
add_buffer_send(data->firstsocket, conn, req_buffer); add_buffer_send(data->firstsocket, conn, req_buffer);
result = Transfer(conn, data->firstsocket, -1, TRUE, result = Curl_Transfer(conn, data->firstsocket, -1, TRUE,
&http->readbytecount, &http->readbytecount,
data->firstsocket, data->firstsocket,
&http->writebytecount); &http->writebytecount);
@ -644,7 +644,7 @@ CURLcode Curl_http(struct connectdata *conn)
add_buffer_send(data->firstsocket, conn, req_buffer); add_buffer_send(data->firstsocket, conn, req_buffer);
/* prepare for transfer */ /* prepare for transfer */
result = Transfer(conn, data->firstsocket, -1, TRUE, result = Curl_Transfer(conn, data->firstsocket, -1, TRUE,
&http->readbytecount, &http->readbytecount,
data->firstsocket, data->firstsocket,
&http->writebytecount); &http->writebytecount);
@ -690,7 +690,7 @@ CURLcode Curl_http(struct connectdata *conn)
add_buffer_send(data->firstsocket, conn, req_buffer); add_buffer_send(data->firstsocket, conn, req_buffer);
/* HTTP GET/HEAD download: */ /* HTTP GET/HEAD download: */
result = Transfer(conn, data->firstsocket, -1, TRUE, bytecount, result = Curl_Transfer(conn, data->firstsocket, -1, TRUE, bytecount,
-1, NULL); /* nothing to upload */ -1, NULL); /* nothing to upload */
} }
if(result) if(result)

View File

@ -71,7 +71,7 @@
#include "urldata.h" #include "urldata.h"
#include <curl/curl.h> #include <curl/curl.h>
#include "download.h" #include "transfer.h"
#include "sendf.h" #include "sendf.h"
#include "formdata.h" #include "formdata.h"
#include "progress.h" #include "progress.h"

View File

@ -85,7 +85,7 @@
#include "ssluse.h" #include "ssluse.h"
#include "hostip.h" #include "hostip.h"
#include "if2ip.h" #include "if2ip.h"
#include "download.h" #include "transfer.h"
#include "sendf.h" #include "sendf.h"
#include "getpass.h" #include "getpass.h"
#include "progress.h" #include "progress.h"
@ -1063,7 +1063,7 @@ static CURLcode _connect(CURL *curl, CURLconnect **in_connect)
conn->curl_do = file; conn->curl_do = file;
/* no done() function */ /* no done() function */
result = Transfer(conn, -1, -1, FALSE, NULL, /* no download */ result = Curl_Transfer(conn, -1, -1, FALSE, NULL, /* no download */
-1, NULL); /* no upload */ -1, NULL); /* no upload */
return CURLE_OK; return CURLE_OK;