From 531fea4c9082d6542c776dcb6d4ca0a3949ecdd0 Mon Sep 17 00:00:00 2001
From: Timo Teräs <timo.teras@iki.fi>
Date: Thu, 5 Oct 2017 13:47:36 +0300
Subject: libfetch: remove unwanted code conditionals

---
 libfetch/ftp.c | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'libfetch/ftp.c')

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');
-- 
cgit v1.2.3-60-g2f50