summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2009-01-21 17:14:56 +0100
committerMichael Adam <obnox@samba.org>2009-01-21 18:40:56 +0100
commit1ed0cc7c9bc0043fe34562438136c0fed30a1746 (patch)
tree781237c53c41bbaff7290298685e90a9108d7676
parentd0a8c356fb7bc5536a8ea7db53ba8a5dd6bee78e (diff)
downloadsamba-1ed0cc7c9bc0043fe34562438136c0fed30a1746.tar.gz
samba-1ed0cc7c9bc0043fe34562438136c0fed30a1746.tar.bz2
samba-1ed0cc7c9bc0043fe34562438136c0fed30a1746.zip
s3:libsmbconf: use talloc_free instead of TALLOC_FREE in txt backend
Michael
-rw-r--r--source3/lib/smbconf/smbconf_txt.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/source3/lib/smbconf/smbconf_txt.c b/source3/lib/smbconf/smbconf_txt.c
index 70d5f82bf0..c4d2d2b1af 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;
}