From: Ralph Boehme Date: Thu, 7 Nov 2019 10:37:47 +0000 (+0100) Subject: param: remove FN_LOCAL_STRING X-Git-Tag: ldb-2.1.0~506 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=31b06f412e91f44e074241564766d9c4869fff9d;p=thirdparty%2Fsamba.git param: remove FN_LOCAL_STRING Signed-off-by: Ralph Boehme Reviewed-by: Stefan Metzmacher --- diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 572d8bff7ac..611c1b240af 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -193,15 +193,12 @@ static struct loadparm_context *global_loadparm_context; /* Local parameters don't need the ->s3_fns because the struct * loadparm_service is shared and lpcfg_service() checks the ->s3_fns * hook */ -#define FN_LOCAL_STRING(fn_name,val) \ +#define FN_LOCAL_SUBSTITUTED_STRING(fn_name,val) \ _PUBLIC_ char *lpcfg_ ## fn_name(struct loadparm_service *service, \ struct loadparm_service *sDefault, TALLOC_CTX *ctx) { \ return(talloc_strdup(ctx, lpcfg_string((const char *)((service != NULL && service->val != NULL) ? service->val : sDefault->val)))); \ } -/* just a copy for now */ -#define FN_LOCAL_SUBSTITUTED_STRING(fn_name,val) FN_LOCAL_STRING(fn_name,val) - #define FN_LOCAL_CONST_STRING(fn_name,val) \ _PUBLIC_ const char *lpcfg_ ## fn_name(struct loadparm_service *service, \ struct loadparm_service *sDefault) { \ diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 462de4f0b5f..ff1a057e3ee 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -1061,8 +1061,6 @@ char *lp_ ## fn_name(TALLOC_CTX *ctx, const struct loadparm_substitution *lp_sub #define FN_GLOBAL_INTEGER(fn_name,ptr) \ int lp_ ## fn_name(void) {return(*(int *)(&Globals.ptr));} -#define FN_LOCAL_STRING(fn_name,val) \ -char *lp_ ## fn_name(TALLOC_CTX *ctx,int i) {return(lp_string((ctx), (LP_SNUM_OK(i) && ServicePtrs[(i)]->val) ? ServicePtrs[(i)]->val : sDefault.val));} #define FN_LOCAL_SUBSTITUTED_STRING(fn_name,val) \ char *lp_ ## fn_name(TALLOC_CTX *ctx, const struct loadparm_substitution *lp_sub, int i) \ {return lpcfg_substituted_string((ctx), lp_sub, (LP_SNUM_OK(i) && ServicePtrs[(i)]->val) ? ServicePtrs[(i)]->val : sDefault.val);}