r2678: from_name and to_name aren't needed in smb_iconv_t

(This used to be commit f3844cc0a5ad6b03f166435d44db02763df345d7)

diff --git a/source4/include/rewrite.h b/source4/include/rewrite.h
index 0bac4ab19e237e6fd7221e58269a4bf395730e84..ce667ba4265407414b7a4e7b39db6318bd5e574b 100644 (file)
--- a/source4/include/rewrite.h
+++ b/source4/include/rewrite.h
@@ -276,7 +276,6 @@ typedef struct {
        size_t (*push)(void *cd, const char **inbuf, size_t *inbytesleft,
                       char **outbuf, size_t *outbytesleft);
        void *cd_direct, *cd_pull, *cd_push;
-       char *from_name, *to_name;
 } *smb_iconv_t;
 
 #include "lib/cmdline/popt_common.h"

diff --git a/source4/lib/iconv.c b/source4/lib/iconv.c
index fb997cf8f11f249a12d17f6d8ee562fa50567221..567f5b590271b5f5bda71dce17ab76fde3db45fd 100644 (file)
--- a/source4/lib/iconv.c
+++ b/source4/lib/iconv.c
@@ -187,9 +187,6 @@ smb_iconv_t smb_iconv_open(const char *tocode, const char *fromcode)
        }
        memset(ret, 0, sizeof(*ret));
 
-       ret->from_name = talloc_strdup(ret, fromcode);
-       ret->to_name = talloc_strdup(ret, tocode);
-
        /* check for the simplest null conversion */
        if (strcmp(fromcode, tocode) == 0) {
                ret->direct = iconv_copy;