From: Michael Adam <obnox@samba.org>
Date: Wed, 21 Jan 2009 16:14:56 +0000 (+0100)
Subject: s3:libsmbconf: use talloc_free instead of TALLOC_FREE in txt backend
X-Git-Tag: samba-4.0.0alpha7~438^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ed0cc7c9bc0043fe34562438136c0fed30a1746;p=thirdparty%2Fsamba.git

s3:libsmbconf: use talloc_free instead of TALLOC_FREE in txt backend

Michael
---

diff --git a/source3/lib/smbconf/smbconf_txt.c b/source3/lib/smbconf/smbconf_txt.c
index 70d5f82bf06..c4d2d2b1af3 100644
--- a/source3/lib/smbconf/smbconf_txt.c
+++ b/source3/lib/smbconf/smbconf_txt.c
@@ -138,7 +138,7 @@ static bool smbconf_txt_do_parameter(const char *param_name,
 	if (!(tpd->verbatim) &&
 	    smbconf_find_in_array(param_name, param_names, num_params, &idx))
 	{
-		TALLOC_FREE(param_values[idx]);
+		talloc_free(param_values[idx]);
 		param_values[idx] = talloc_strdup(cache, param_value);
 		if (param_values[idx] == NULL) {
 			return false;
@@ -160,7 +160,8 @@ static bool smbconf_txt_do_parameter(const char *param_name,
 
 static void smbconf_txt_flush_cache(struct smbconf_ctx *ctx)
 {
-	TALLOC_FREE(pd(ctx)->cache);
+	talloc_free(pd(ctx)->cache);
+	pd(ctx)->cache = NULL;
 }
 
 static WERROR smbconf_txt_init_cache(struct smbconf_ctx *ctx)
@@ -359,7 +360,7 @@ static WERROR smbconf_txt_get_share_names(struct smbconf_ctx *ctx,
 	}
 
 done:
-	TALLOC_FREE(tmp_ctx);
+	talloc_free(tmp_ctx);
 	return werr;
 }
 
@@ -458,7 +459,7 @@ static WERROR smbconf_txt_get_share(struct smbconf_ctx *ctx,
 	}
 
 done:
-	TALLOC_FREE(tmp_ctx);
+	talloc_free(tmp_ctx);
 	return werr;
 }
 
@@ -593,7 +594,7 @@ static WERROR smbconf_txt_get_includes(struct smbconf_ctx *ctx,
 	werr = WERR_OK;
 
 done:
-	TALLOC_FREE(tmp_ctx);
+	talloc_free(tmp_ctx);
 	return werr;
 }