diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2017-10-05 13:47:36 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-10-05 16:59:14 +0300 |
| commit | 531fea4c9082d6542c776dcb6d4ca0a3949ecdd0 (patch) | |
| tree | 5d7d5ccb6d78c415cc4422569d9f88f0b1cf8bd1 /libfetch/ftp.c | |
| parent | f6860e0e110a82fe61ce46de4fb5a05794e456ab (diff) | |
| download | apk-tools-531fea4c9082d6542c776dcb6d4ca0a3949ecdd0.tar.gz apk-tools-531fea4c9082d6542c776dcb6d4ca0a3949ecdd0.tar.bz2 apk-tools-531fea4c9082d6542c776dcb6d4ca0a3949ecdd0.tar.xz apk-tools-531fea4c9082d6542c776dcb6d4ca0a3949ecdd0.zip | |
libfetch: remove unwanted code conditionals
Diffstat (limited to 'libfetch/ftp.c')
| -rw-r--r-- | libfetch/ftp.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/libfetch/ftp.c b/libfetch/ftp.c index af6a964..6caadf2 100644 --- a/libfetch/ftp.c +++ b/libfetch/ftp.c @@ -57,16 +57,10 @@ * */ -#if HAVE_CONFIG_H -#include "config.h" -#endif - #include <sys/types.h> #include <sys/socket.h> - #include <netinet/in.h> #include <arpa/inet.h> - #include <ctype.h> #include <errno.h> #include <fcntl.h> @@ -353,7 +347,6 @@ ftp_cwd(conn_t *conn, const char *path, int subdir) } free(pwd); -#ifdef FTP_COMBINE_CWDS /* Skip leading slashes, even "////". */ for (beg = dst + i; beg < end && *beg == '/'; ++beg, ++i) /* nothing */ ; @@ -370,7 +363,6 @@ ftp_cwd(conn_t *conn, const char *path, int subdir) free(dst); return (0); } -#endif /* FTP_COMBINE_CWDS */ /* That didn't work so go back to legacy behavior (multiple CWDs). */ for (beg = dst + i; beg < end; beg = dst + i + 1) { @@ -1019,11 +1011,7 @@ ftp_connect(struct url *url, struct url *purl, const char *flags) { conn_t *conn; int e, direct, verbose; -#ifdef INET6 int af = AF_UNSPEC; -#else - int af = AF_INET; -#endif direct = CHECK_FLAG('d'); verbose = CHECK_FLAG('v'); |