From 0f119aa9c182b0e3be0808b924cf47f73c812ea6 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 27 Jan 2014 14:58:14 +1300 Subject: lib/param: Remove unused lpcfg_next_parameter (once used by SWAT) Signed-off-by: Andrew Bartlett Reviewed-by: Michael Adam --- lib/param/loadparm.c | 52 ---------------------------------------------------- lib/param/param.h | 7 ------- 2 files changed, 59 deletions(-) diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index e338352aff..ae5f01cd38 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -1930,58 +1930,6 @@ bool lpcfg_dump_a_parameter(struct loadparm_context *lp_ctx, return true; } -/** - * Return info about the next parameter in a service. - * snum==-1 gives the globals. - * Return NULL when out of parameters. - */ - - -struct parm_struct *lpcfg_next_parameter(struct loadparm_context *lp_ctx, int snum, int *i, - int allparameters) -{ - if (snum == -1) { - /* do the globals */ - for (; parm_table[*i].label; (*i)++) { - if ((*parm_table[*i].label == '-')) - continue; - - if ((*i) > 0 - && (parm_table[*i].offset == - parm_table[(*i) - 1].offset) - && (parm_table[*i].p_class == - parm_table[(*i) - 1].p_class)) - continue; - - return &parm_table[(*i)++]; - } - } else { - struct loadparm_service *pService = lp_ctx->services[snum]; - - for (; parm_table[*i].label; (*i)++) { - if (parm_table[*i].p_class == P_LOCAL && - (*parm_table[*i].label != '-') && - ((*i) == 0 || - (parm_table[*i].offset != - parm_table[(*i) - 1].offset))) - { - if (allparameters || - !lpcfg_equal_parameter(parm_table[*i].type, - ((char *)pService) + - parm_table[*i].offset, - ((char *)lp_ctx->sDefault) + - parm_table[*i].offset)) - { - return &parm_table[(*i)++]; - } - } - } - } - - return NULL; -} - - /** * Auto-load some home services. */ diff --git a/lib/param/param.h b/lib/param/param.h index 7e73dd0f23..77c3c77004 100644 --- a/lib/param/param.h +++ b/lib/param/param.h @@ -140,13 +140,6 @@ bool lpcfg_dump_a_parameter(struct loadparm_context *lp_ctx, struct loadparm_service *service, const char *parm_name, FILE * f); -/** - * Return info about the next service in a service. snum==-1 gives the globals. - * Return NULL when out of parameters. - */ -struct parm_struct *lpcfg_next_parameter(struct loadparm_context *lp_ctx, int snum, int *i, - int allparameters); - /** * Unload unused services. */ -- cgit