diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-27 16:27:56 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-07-07 23:32:36 +0200 |
| commit | ee722f48c457ebbdd90a157ac4db12a8c4edb3b9 (patch) | |
| tree | 7e82c0c3bbd389e0df4a0238331f8a941ecde58d /source3/param | |
| parent | 6ad9333784dc4d02e57548c08af07af4f62732a0 (diff) | |
| download | samba-ee722f48c457ebbdd90a157ac4db12a8c4edb3b9.tar.gz | |
param: remove unnecessary lp_local_ptr_by_snum function
The function only appears twice and it can be easily inlined without
any real loss to meaning or readability.
Change-Id: Iabf6d202cedd95ad4f223e89c7d3be8dfbe36389
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Nadezhda Ivanova <nivanova@samba.org>
Diffstat (limited to 'source3/param')
| -rw-r--r-- | source3/param/loadparm.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 16d877d274f..86dfedc46dc 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -536,7 +536,7 @@ static void free_one_parameter_by_snum(int snum, struct parm_struct parm) } else if (parm.p_class != P_LOCAL) { return; } else { - parm_ptr = lp_local_ptr_by_snum(snum, &parm); + parm_ptr = lp_parm_ptr(ServicePtrs[snum], &parm); } free_one_parameter_common(parm_ptr, parm); @@ -2538,15 +2538,6 @@ void *lp_parm_ptr(struct loadparm_service *service, struct parm_struct *parm) } /*************************************************************************** - Return the local pointer to a parameter given the service number and parameter -***************************************************************************/ - -void *lp_local_ptr_by_snum(int snum, struct parm_struct *parm) -{ - return lp_parm_ptr(ServicePtrs[snum], parm); -} - -/*************************************************************************** Process a parameter for a particular service number. If snum < 0 then assume we are in the globals. ***************************************************************************/ @@ -2608,7 +2599,7 @@ bool lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue TALLOC_FREE(frame); return true; } - parm_ptr = lp_local_ptr_by_snum(snum, &parm_table[parmnum]); + parm_ptr = lp_parm_ptr(ServicePtrs[snum], &parm_table[parmnum]); } if (snum >= 0) { |