diff options
author | Daniel Stenberg <daniel@haxx.se> | 2011-04-05 13:55:11 +0200 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2011-04-05 13:55:11 +0200 |
commit | 8321a367ee1da094147384a6619334221f5d014c (patch) | |
tree | 0a0dcd78448abf7ecdc4db3bf4bf8c114ca9531e /lib/ftp.c | |
parent | 8e9e19b0d582f9ee6e4f6a5f376e9b874869d319 (diff) |
FTP+proxy: macrofied functions when proxy disabled
In my attempts to reduce #ifdefs in code, the SOCKS functions are now
macros when libcurl is built without proxy support and therefore the FTP
code could avoid some #ifs.
Diffstat (limited to 'lib/ftp.c')
-rw-r--r-- | lib/ftp.c | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -1719,7 +1719,6 @@ static CURLcode ftp_state_pasv_resp(struct connectdata *conn, ftp_pasv_verbose(conn, conninfo, newhost, connectport); switch(data->set.proxytype) { -#ifndef CURL_DISABLE_PROXY /* FIX: this MUST wait for a proper connect first if 'connected' is * FALSE */ case CURLPROXY_SOCKS5: @@ -1735,7 +1734,6 @@ static CURLcode ftp_state_pasv_resp(struct connectdata *conn, result = Curl_SOCKS4(conn->proxyuser, newhost, newport, SECONDARYSOCKET, conn, TRUE); break; -#endif /* CURL_DISABLE_PROXY */ case CURLPROXY_HTTP: case CURLPROXY_HTTP_1_0: /* do nothing here. handled later. */ @@ -2924,7 +2922,6 @@ static CURLcode ftp_connect(struct connectdata *conn, pp->endofresp = ftp_endofresp; pp->conn = conn; -#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_PROXY) if(conn->bits.tunnel_proxy && conn->bits.httpproxy) { /* for FTP over HTTP proxy */ struct HTTP http_proxy; @@ -2951,7 +2948,6 @@ static CURLcode ftp_connect(struct connectdata *conn, if(CURLE_OK != result) return result; } -#endif /* !CURL_DISABLE_HTTP && !CURL_DISABLE_PROXY */ if(conn->handler->protocol & CURLPROTO_FTPS) { /* BLOCKING */ |