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>

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 13d3425eeb7c0dde9042070dcf9aecc034f48dd1..d9159f372d8702e1098a64a9ae8c826e894f76f7 100644 (file)
--- 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 b83a528ba2291da7c8868f4bf2af21feb6cb8630..6631bc64e347aaba7267b30997b5bf7fb5d05947 100644 (file)
--- 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);

diff --git a/source3/include/proto.h b/source3/include/proto.h
index c4d1606b93c6d90ef3d1e5fa922acad57e14f9fd..70fa7f74ed7fde98e0422e8a401e3ac3bec5066b 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1042,7 +1042,6 @@ void *lp_local_ptr_by_snum(int snum, struct parm_struct *parm);
 bool lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue);
 bool lp_set_cmdline(const char *pszParmName, const char *pszParmValue);
 bool dump_a_parameter(int snum, char *parm_name, FILE * f, bool isGlobal);
-struct parm_struct *lp_get_parameter(const char *param_name);
 bool lp_snum_ok(int iService);
 void lp_add_one_printer(const char *name, const char *comment,
                        const char *location, void *pdata);

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 89d3fece21416a6c2801fece390716a7151fb526..dee62246551951617082b965468e2e227b049ab1 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -2647,22 +2647,6 @@ bool dump_a_parameter(int snum, char *parm_name, FILE * f, bool isGlobal)
        return result;
 }
 
-/***************************************************************************
- Return info about the requested parameter (given as a string).
- Return NULL when the string is not a valid parameter name.
-***************************************************************************/
-
-struct parm_struct *lp_get_parameter(const char *param_name)
-{
-       int num = lpcfg_map_parameter(param_name);
-
-       if (num < 0) {
-               return NULL;
-       }
-
-       return &parm_table[num];
-}
-
 #if 0
 /***************************************************************************
  Display the contents of a single copy structure.

diff --git a/source3/param/loadparm_ctx.c b/source3/param/loadparm_ctx.c
index a8539d636a056d972d5ad3adeaefd6f62d3e34f1..8f1572fdaac5ccd15a8ee1c065b6e2cbb410a5a8 100644 (file)
--- a/source3/param/loadparm_ctx.c
+++ b/source3/param/loadparm_ctx.c
@@ -58,7 +58,6 @@ static bool lp_load_for_s4_ctx(const char *filename)
 
 static struct loadparm_s3_helpers s3_fns =
 {
-       .get_parm_struct = lp_get_parameter,
        .get_parm_ptr = lp_parm_ptr,
        .get_service = lp_service_for_s4_ctx,
        .get_servicebynum = lp_servicebynum_for_s4_ctx,