diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-07-09 12:25:36 +1200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2014-07-31 08:17:11 +0200 |
| commit | 47f10ac65c2df3034ae5e943a396d86aa201667a (patch) | |
| tree | 7ad52d2f644eea2aa8151e18e7daac8d6e380651 /lib/param | |
| parent | 0796dc6fe009ec5305f1e748f00a1f305080e10d (diff) | |
| download | samba-47f10ac65c2df3034ae5e943a396d86aa201667a.tar.gz samba-47f10ac65c2df3034ae5e943a396d86aa201667a.tar.xz samba-47f10ac65c2df3034ae5e943a396d86aa201667a.zip | |
param: remove lp_get_parameter
Ensure lpcfg_parm_struct, its counterpart is equivalent
Change-Id: I127ce5d3cf7fe02ebf161aa011ec3b41bc32a656
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'lib/param')
| -rw-r--r-- | lib/param/loadparm.c | 10 | ||||
| -rw-r--r-- | lib/param/s3_param.h | 1 |
2 files changed, 4 insertions, 7 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 13d3425eeb..d9159f372d 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -730,15 +730,13 @@ int lpcfg_map_parameter(const char *pszParmName) */ struct parm_struct *lpcfg_parm_struct(struct loadparm_context *lp_ctx, const char *name) { - int parmnum; + int num = lpcfg_map_parameter(name); - if (lp_ctx->s3_fns) { - return lp_ctx->s3_fns->get_parm_struct(name); + if (num < 0) { + return NULL; } - parmnum = lpcfg_map_parameter(name); - if (parmnum == -1) return NULL; - return &parm_table[parmnum]; + return &parm_table[num]; } /** diff --git a/lib/param/s3_param.h b/lib/param/s3_param.h index b83a528ba2..6631bc64e3 100644 --- a/lib/param/s3_param.h +++ b/lib/param/s3_param.h @@ -3,7 +3,6 @@ struct loadparm_s3_helpers { - struct parm_struct * (*get_parm_struct)(const char *param_name); void * (*get_parm_ptr)(struct loadparm_service *service, struct parm_struct *parm); struct loadparm_service * (*get_service)(const char *service_name); struct loadparm_service * (*get_default_loadparm_service)(void); |