Commit ae0a6835 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

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

and download.h
parent f2f11be8

lib/dict.c

+4 −4
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 


#include "urldata.h"

#include <curl/curl.h>

#include "download.h"

#include "transfer.h"

#include "sendf.h"



#include "progress.h"
@@ -154,7 +154,7 @@ CURLcode Curl_dict(struct connectdata *conn) 
          word

          );

    

    result = Transfer(conn, data->firstsocket, -1, FALSE, bytecount,

    result = Curl_Transfer(conn, data->firstsocket, -1, FALSE, bytecount,

                      -1, NULL); /* no upload */

      

    if(result)
@@ -202,7 +202,7 @@ CURLcode Curl_dict(struct connectdata *conn) 
          word

          );

    

    result = Transfer(conn, data->firstsocket, -1, FALSE, bytecount,

    result = Curl_Transfer(conn, data->firstsocket, -1, FALSE, bytecount,

                      -1, NULL); /* no upload */

      

    if(result)
@@ -226,7 +226,7 @@ CURLcode Curl_dict(struct connectdata *conn) 
            "QUIT\n",

            ppath);

      

      result = Transfer(conn, data->firstsocket, -1, FALSE, bytecount,

      result = Curl_Transfer(conn, data->firstsocket, -1, FALSE, bytecount,

                        -1, NULL);

      

      if(result)

lib/easy.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ 


#include "urldata.h"

#include <curl/curl.h>

#include "highlevel.h"

#include "transfer.h"

#include <curl/types.h>



#define _MPRINTF_REPLACE /* use our functions only */

lib/ftp.c

+3 −3
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
#include "if2ip.h"

#include "hostip.h"

#include "progress.h"

#include "download.h"

#include "transfer.h"

#include "escape.h"

#include "http.h" /* for HTTP proxy tunnel stuff */

#include "ftp.h"
@@ -1110,7 +1110,7 @@ CURLcode _ftp(struct connectdata *conn) 


    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);

    if(result)

      return result;
@@ -1339,7 +1339,7 @@ CURLcode _ftp(struct connectdata *conn) 
      infof(data, "Getting file with size: %d\n", size);



      /* FTP download: */

      result=Transfer(conn, data->secondarysocket, size, FALSE,

      result=Curl_Transfer(conn, data->secondarysocket, size, FALSE,

                      bytecountp,

                      -1, NULL); /* no upload here */

      if(result)

lib/http.c

+4 −4
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ 


#include "urldata.h"

#include <curl/curl.h>

#include "download.h"

#include "transfer.h"

#include "sendf.h"

#include "formdata.h"

#include "progress.h"
@@ -616,7 +616,7 @@ CURLcode Curl_http(struct connectdata *conn) 


      data->request_size = 

        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,

                          data->firstsocket,

                        &http->writebytecount);
@@ -644,7 +644,7 @@ CURLcode Curl_http(struct connectdata *conn) 
        add_buffer_send(data->firstsocket, conn, req_buffer);



      /* prepare for transfer */

      result = Transfer(conn, data->firstsocket, -1, TRUE,

      result = Curl_Transfer(conn, data->firstsocket, -1, TRUE,

                        &http->readbytecount,

                        data->firstsocket,

                        &http->writebytecount);
@@ -690,7 +690,7 @@ CURLcode Curl_http(struct connectdata *conn) 
        add_buffer_send(data->firstsocket, conn, req_buffer);



      /* 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 */

    }

    if(result)

lib/telnet.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 


#include "urldata.h"

#include <curl/curl.h>

#include "download.h"

#include "transfer.h"

#include "sendf.h"

#include "formdata.h"

#include "progress.h"