svn commit: samba r2169 - in branches/SAMBA_4_0/source/lib: .

[tridge at samba.org]

Author: tridge
Date: 2004-09-01 09:45:00 +0000 (Wed, 01 Sep 2004)
New Revision: 2169

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

Log:
switch core iconv code to use talloc


Modified:
   branches/SAMBA_4_0/source/lib/iconv.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/iconv.c
===================================================================
--- branches/SAMBA_4_0/source/lib/iconv.c	2004-09-01 09:40:09 UTC (rev 2168)
+++ branches/SAMBA_4_0/source/lib/iconv.c	2004-09-01 09:45:00 UTC (rev 2169)
@@ -179,15 +179,16 @@
 	from = charsets;
 	to = charsets;
 
-	ret = (smb_iconv_t)malloc(sizeof(*ret));
+	ret = (smb_iconv_t)talloc_named(NULL, sizeof(*ret), 
+					"iconv(%s,%s)", tocode, fromcode);
 	if (!ret) {
 		errno = ENOMEM;
 		return (smb_iconv_t)-1;
 	}
 	memset(ret, 0, sizeof(*ret));
 
-	ret->from_name = strdup(fromcode);
-	ret->to_name = strdup(tocode);
+	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) {
@@ -258,7 +259,7 @@
 	return ret;
 
 failed:
-	SAFE_FREE(ret);
+	talloc_free(ret);
 	errno = EINVAL;
 	return (smb_iconv_t)-1;
 }
@@ -266,7 +267,7 @@
 /*
   simple iconv_close() wrapper
 */
-int smb_iconv_close (smb_iconv_t cd)
+int smb_iconv_close(smb_iconv_t cd)
 {
 #ifdef HAVE_NATIVE_ICONV
 	if (cd->cd_direct) iconv_close((iconv_t)cd->cd_direct);
@@ -274,11 +275,7 @@
 	if (cd->cd_push) iconv_close((iconv_t)cd->cd_push);
 #endif
 
-	SAFE_FREE(cd->from_name);
-	SAFE_FREE(cd->to_name);
-
-	memset(cd, 0, sizeof(*cd));
-	SAFE_FREE(cd);
+	talloc_free(cd);
 	return 0;
 }
 
@@ -699,3 +696,5 @@
 	return -1;
 }
 
+
+