diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-03-27 15:33:03 +1300 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2014-07-31 08:17:11 +0200 |
| commit | a7c4446bef0d2b4e57fba7f3593f8c7379896160 (patch) | |
| tree | 390f43b118c1bac465db3f24bb2b9c8e28913bec /source3/param | |
| parent | 6edf710c7b5b8d558ec8065d759f42bbc6ca42a0 (diff) | |
| download | samba-a7c4446bef0d2b4e57fba7f3593f8c7379896160.tar.gz samba-a7c4446bef0d2b4e57fba7f3593f8c7379896160.tar.xz samba-a7c4446bef0d2b4e57fba7f3593f8c7379896160.zip | |
param: remove is_default method in s3
Change-Id: Ia9c7422c5f7b56eb81ad644b369bfa36849e963e
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 'source3/param')
| -rw-r--r-- | source3/param/loadparm.c | 42 |
1 files changed, 1 insertions, 41 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 13ab5d0522..547acf8e32 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -2729,46 +2729,6 @@ bool lp_do_section(const char *pszSectionName, void *userdata) return bRetval; } - -/*************************************************************************** - Determine if a partcular base parameter is currentl set to the default value. -***************************************************************************/ - -static bool is_default(int i) -{ - switch (parm_table[i].type) { - case P_LIST: - case P_CMDLIST: - return str_list_equal((const char * const *)parm_table[i].def.lvalue, - *(const char ***)lp_parm_ptr(NULL, - &parm_table[i])); - case P_STRING: - case P_USTRING: - return strequal(parm_table[i].def.svalue, - *(char **)lp_parm_ptr(NULL, - &parm_table[i])); - case P_BOOL: - case P_BOOLREV: - return parm_table[i].def.bvalue == - *(bool *)lp_parm_ptr(NULL, - &parm_table[i]); - case P_CHAR: - return parm_table[i].def.cvalue == - *(char *)lp_parm_ptr(NULL, - &parm_table[i]); - case P_INTEGER: - case P_OCTAL: - case P_ENUM: - case P_BYTES: - return parm_table[i].def.ivalue == - *(int *)lp_parm_ptr(NULL, - &parm_table[i]); - case P_SEP: - break; - } - return false; -} - /*************************************************************************** Display the contents of the global structure. ***************************************************************************/ @@ -2784,7 +2744,7 @@ static void dump_globals(FILE *f, bool show_defaults) if (parm_table[i].p_class == P_GLOBAL && !(parm_table[i].flags & FLAG_META) && (i == 0 || (parm_table[i].offset != parm_table[i - 1].offset))) { - if (show_defaults && is_default(i)) + if (show_defaults && is_default(&Globals, i)) continue; fprintf(f, "\t%s = ", parm_table[i].label); lpcfg_print_parameter(&parm_table[i], lp_parm_ptr(NULL, |