svn commit: samba r2678 - in branches/SAMBA_4_0/source: include lib

[tridge at samba.org]

Author: tridge
Date: 2004-09-27 08:39:06 +0000 (Mon, 27 Sep 2004)
New Revision: 2678

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source&rev=2678&nolog=1

Log:
from_name and to_name aren't needed in smb_iconv_t

Modified:
   branches/SAMBA_4_0/source/include/rewrite.h
   branches/SAMBA_4_0/source/lib/iconv.c


Changeset:
Modified: branches/SAMBA_4_0/source/include/rewrite.h
===================================================================
--- branches/SAMBA_4_0/source/include/rewrite.h	2004-09-27 08:38:13 UTC (rev 2677)
+++ branches/SAMBA_4_0/source/include/rewrite.h	2004-09-27 08:39:06 UTC (rev 2678)
@@ -276,7 +276,6 @@
 	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"

Modified: branches/SAMBA_4_0/source/lib/iconv.c
===================================================================
--- branches/SAMBA_4_0/source/lib/iconv.c	2004-09-27 08:38:13 UTC (rev 2677)
+++ branches/SAMBA_4_0/source/lib/iconv.c	2004-09-27 08:39:06 UTC (rev 2678)
@@ -187,9 +187,6 @@
 	}
 	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;