summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-09-27 08:39:06 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:59:21 -0500
commit6f068e207ab6b6c0206df35e51c56119c2a82fef (patch)
tree3e17988cfb7099513b35c3ff41be1184277d75f0 /source4
parent2f5cf5d7946e730f9e42b7914d5b1f2cbc5a2cc2 (diff)
downloadsamba-6f068e207ab6b6c0206df35e51c56119c2a82fef.tar.gz
samba-6f068e207ab6b6c0206df35e51c56119c2a82fef.tar.bz2
samba-6f068e207ab6b6c0206df35e51c56119c2a82fef.zip
r2678: from_name and to_name aren't needed in smb_iconv_t
(This used to be commit f3844cc0a5ad6b03f166435d44db02763df345d7)
Diffstat (limited to 'source4')
-rw-r--r--source4/include/rewrite.h1
-rw-r--r--source4/lib/iconv.c3
2 files changed, 0 insertions, 4 deletions
diff --git a/source4/include/rewrite.h b/source4/include/rewrite.h
index 0bac4ab19e..ce667ba426 100644
--- 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 fb997cf8f1..567f5b5902 100644
--- 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;