From 666dba33531c7e7d391318c915fb393ec5b1da36 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 27 Jun 2012 23:24:39 +1000 Subject: s3-param: Rename loadparm_s3_context -> loadparm_s3_helpers This helps clarify the role of this structure and wrapper function. The purpose here is to provide helper functions to the lib/param loadparm_context that point back at the s3 lp_ functions. This allows a struct loadparm_context to be passed to any point in the code, and always refer to the correct loadparm system. If this has not been set, the variables loaded in the lib/param code will be returned. As requested by Michael Adam. Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Wed Jun 27 17:11:16 CEST 2012 on sn-devel-104 --- source3/param/loadparm_ctx.c | 4 ++-- source3/param/pyparam.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/param') diff --git a/source3/param/loadparm_ctx.c b/source3/param/loadparm_ctx.c index 437ce43506..9c78f15879 100644 --- a/source3/param/loadparm_ctx.c +++ b/source3/param/loadparm_ctx.c @@ -60,7 +60,7 @@ static bool lp_load_for_s4_ctx(const char *filename) * All of the s4 loadparm functions should be here eventually, once * they are implemented in the s3 loadparm, have the same format (enum * values in particular) and defaults. */ -static const struct loadparm_s3_context s3_fns = +static const struct loadparm_s3_helpers s3_fns = { .get_parametric = lp_parm_const_string_service, .get_parm_struct = lp_get_parameter, @@ -117,7 +117,7 @@ static const struct loadparm_s3_context s3_fns = .passwordserver = lp_passwordserver }; -const struct loadparm_s3_context *loadparm_s3_context(void) +const struct loadparm_s3_helpers *loadparm_s3_helpers(void) { return &s3_fns; } diff --git a/source3/param/pyparam.c b/source3/param/pyparam.c index ff234ac918..ddd17ca4b5 100644 --- a/source3/param/pyparam.c +++ b/source3/param/pyparam.c @@ -30,7 +30,7 @@ void initparam(void); static PyObject *py_get_context(PyObject *self) { PyObject *py_loadparm; - const struct loadparm_s3_context *s3_context; + const struct loadparm_s3_helpers *s3_context; const struct loadparm_context *s4_context; TALLOC_CTX *mem_ctx; @@ -40,7 +40,7 @@ static PyObject *py_get_context(PyObject *self) return NULL; } - s3_context = loadparm_s3_context(); + s3_context = loadparm_s3_helpers(); s4_context = loadparm_init_s3(mem_ctx, s3_context); if (s4_context == NULL) { -- cgit