diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2014-01-27 14:58:21 +1300 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2014-01-30 01:21:26 +0100 |
| commit | 02d60cd028e2d33b591056b8b07b2fc9b9c262b1 (patch) | |
| tree | eaad7893c6489eb57e29ba38c22b20dd01fc5e32 /source3 | |
| parent | 0f119aa9c182b0e3be0808b924cf47f73c812ea6 (diff) | |
| download | samba-02d60cd028e2d33b591056b8b07b2fc9b9c262b1.tar.gz samba-02d60cd028e2d33b591056b8b07b2fc9b9c262b1.tar.xz samba-02d60cd028e2d33b591056b8b07b2fc9b9c262b1.zip | |
param: Remove unused lp_next_parameter (once used by SWAT)
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/proto.h | 1 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 59 |
2 files changed, 0 insertions, 60 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index ceaa9024ce..8585e911ff 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1053,7 +1053,6 @@ bool lp_set_option(const char *option); bool lp_is_default(int snum, struct parm_struct *parm); bool dump_a_parameter(int snum, char *parm_name, FILE * f, bool isGlobal); struct parm_struct *lp_get_parameter(const char *param_name); -struct parm_struct *lp_next_parameter(int snum, int *i, int allparameters); 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 b90eee50d3..d71a8a0bde 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -3673,65 +3673,6 @@ struct parm_struct *lp_get_parameter(const char *param_name) return &parm_table[num]; } -/*************************************************************************** - Return info about the next parameter in a service. - snum==GLOBAL_SECTION_SNUM gives the globals. - Return NULL when out of parameters. -***************************************************************************/ - -struct parm_struct *lp_next_parameter(int snum, int *i, int allparameters) -{ - if (snum < 0) { - /* do the globals */ - for (; parm_table[*i].label; (*i)++) { - if (parm_table[*i].p_class == P_SEPARATOR) - return &parm_table[(*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; - - if (is_default(*i) && !allparameters) - continue; - - return &parm_table[(*i)++]; - } - } else { - struct loadparm_service *pService = ServicePtrs[snum]; - - for (; parm_table[*i].label; (*i)++) { - if (parm_table[*i].p_class == P_SEPARATOR) - return &parm_table[(*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, - lp_parm_ptr(pService, - &parm_table[*i]), - lp_parm_ptr(NULL, - &parm_table[*i]))) - { - return &parm_table[(*i)++]; - } - } - } - } - - return NULL; -} - - #if 0 /*************************************************************************** Display the contents of a single copy structure. |