diff options
author | Daniel Stenberg <daniel@haxx.se> | 2011-04-20 00:48:20 +0200 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2011-04-20 00:50:07 +0200 |
commit | c828646f60b5bffb2bfcf924eba36da767bf08bf (patch) | |
tree | a13db5750b3927a2dea67364fbafba4b91fa7e9f /lib/ftp.c | |
parent | eb65a49befa040746b222e693bba19ee56814e85 (diff) |
CURL_DOES_CONVERSIONS: cleanup
Massively reduce #ifdefs all over (23 #ifdef lines less so far)
Moved conversion-specific code to non-ascii.c
Diffstat (limited to 'lib/ftp.c')
-rw-r--r-- | lib/ftp.c | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -61,8 +61,6 @@ #include <curl/curl.h> #include "urldata.h" #include "sendf.h" -#include "easyif.h" /* for Curl_convert_... prototypes */ - #include "if2ip.h" #include "hostip.h" #include "progress.h" @@ -94,6 +92,7 @@ #include "speedcheck.h" #include "warnless.h" #include "http_proxy.h" +#include "non-ascii.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> @@ -3772,13 +3771,10 @@ CURLcode Curl_ftpsendf(struct connectdata *conn, bytes_written=0; write_len = strlen(s); -#ifdef CURL_DOES_CONVERSIONS res = Curl_convert_to_network(conn->data, s, write_len); /* Curl_convert_to_network calls failf if unsuccessful */ - if(res != CURLE_OK) { + if(res) return(res); - } -#endif /* CURL_DOES_CONVERSIONS */ for(;;) { #if defined(HAVE_KRB4) || defined(HAVE_GSSAPI) |