From fd84342b82641bfe1e8bc5460049f58369cf5532 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Sun, 28 Aug 2016 10:14:34 +0200
Subject: [PATCH] libkiconv: Remove dead code.

ICONV_DLOPEN is never defined on DragonFly because we build iconv()
into libc by default.
---
 lib/libkiconv/xlat16_iconv.c | 30 +-----------------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git a/lib/libkiconv/xlat16_iconv.c b/lib/libkiconv/xlat16_iconv.c
index 079ad48aae..926c439189 100644
--- a/lib/libkiconv/xlat16_iconv.c
+++ b/lib/libkiconv/xlat16_iconv.c
@@ -41,6 +41,7 @@
 #include <dlfcn.h>
 #include <err.h>
 #include <errno.h>
+#include <iconv.h>
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -58,19 +59,10 @@ struct xlat16_table {
 static struct xlat16_table kiconv_xlat16_open(const char *, const char *, int);
 static int chklocale(int, const char *);
 
-#ifdef ICONV_DLOPEN
-typedef void *iconv_t;
-static int my_iconv_init(void);
-static iconv_t (*my_iconv_open)(const char *, const char *);
-static size_t (*my_iconv)(iconv_t, char **, size_t *, char **, size_t *);
-static int (*my_iconv_close)(iconv_t);
-#else
-#include <iconv.h>
 #define my_iconv_init() 0
 #define my_iconv_open iconv_open
 #define my_iconv iconv
 #define my_iconv_close iconv_close
-#endif
 static size_t my_iconv_char(iconv_t, u_char **, size_t *, u_char **, size_t *);
 
 int
@@ -317,26 +309,6 @@ chklocale(int category, const char *code)
 	return (error);
 }
 
-#ifdef ICONV_DLOPEN
-static int
-my_iconv_init(void)
-{
-	void *iconv_lib;
-
-	iconv_lib = dlopen("libiconv.so", RTLD_LAZY | RTLD_GLOBAL);
-	if (iconv_lib == NULL) {
-		warn("Unable to load iconv library: %s\n", dlerror());
-		errno = ENOENT;
-		return (-1);
-	}
-	my_iconv_open = dlsym(iconv_lib, "iconv_open");
-	my_iconv = dlsym(iconv_lib, "iconv");
-	my_iconv_close = dlsym(iconv_lib, "iconv_close");
-
-	return (0);
-}
-#endif
-
 static size_t
 my_iconv_char(iconv_t cd, u_char **ibuf, size_t * ilen, u_char **obuf,
 	size_t * olen)
-- 
2.41.0