From 8ddbb23788f6096f2b255a959344933a7ed33f63 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 21 Jan 2009 17:14:56 +0100 Subject: [PATCH] s3:libsmbconf: use talloc_free instead of TALLOC_FREE in txt backend Michael Signed-off-by: Michael Adam (cherry picked from commit 8589fa2cfe8fb549b013d2f15a598e43e28b64d7) --- source/lib/smbconf/smbconf_txt.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/source/lib/smbconf/smbconf_txt.c b/source/lib/smbconf/smbconf_txt.c index 0ebe6f1548d..d9e4e088c66 100644 --- a/source/lib/smbconf/smbconf_txt.c +++ b/source/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; } -- 2.11.4.GIT