Commit 0a3065a2 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Rename Curl_pretransfersec() to *_second_connect() since it does not just 

do pretransfer stuff like Curl_pretransfer().
parent b98faaa8

lib/transfer.c

+3 −3
Original line number Diff line number Diff line
@@ -2136,7 +2136,7 @@ CURLcode Curl_perform(struct SessionHandle *data) 


    if(res == CURLE_OK) {

      if (data->set.source_url) /* 3rd party transfer */

        res = Curl_pretransfersec(conn);

        res = Curl_second_connect(conn);

      else

        conn->sec_conn = NULL;

    }
@@ -2250,10 +2250,10 @@ Curl_Transfer(struct connectdata *c_conn, /* connection data */ 
}



/*

 * Curl_pretransfersec() prepares the secondary connection (used for 3rd party

 * Curl_second_connect() makes the secondary connection (used for 3rd party

 * FTP transfers).

 */

CURLcode Curl_pretransfersec(struct connectdata *conn)

CURLcode Curl_second_connect(struct connectdata *conn)

{

  CURLcode status = CURLE_OK;

  struct SessionHandle *data = conn->data;

lib/transfer.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
 ***************************************************************************/

CURLcode Curl_perform(struct SessionHandle *data);

CURLcode Curl_pretransfer(struct SessionHandle *data);

CURLcode Curl_pretransfersec(struct connectdata *conn);

CURLcode Curl_second_connect(struct connectdata *conn);

CURLcode Curl_posttransfer(struct SessionHandle *data);

CURLcode Curl_follow(struct SessionHandle *data, char *newurl, bool retry);

CURLcode Curl_readwrite(struct connectdata *conn, bool *done);