mirror of
https://github.com/samba-team/samba.git
synced 2025-03-01 04:58:35 +03:00
param: move defaults_saved global out of dump_globals function
Removes an unnecessary dependency on a global variable. Change-Id: I87fc63190a3b8ceba5fb5606fa0e7d5e1f2633a4 Signed-off-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Nadezhda Ivanova <nivanova@samba.org>
This commit is contained in:
parent
f1c28fcc23
commit
bdbafe51da
@ -2853,7 +2853,7 @@ static bool is_default(int i)
|
||||
Display the contents of the global structure.
|
||||
***************************************************************************/
|
||||
|
||||
static void dump_globals(FILE *f)
|
||||
static void dump_globals(FILE *f, bool show_defaults)
|
||||
{
|
||||
int i;
|
||||
struct parmlist_entry *data;
|
||||
@ -2864,7 +2864,7 @@ static void dump_globals(FILE *f)
|
||||
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 (defaults_saved && is_default(i))
|
||||
if (show_defaults && is_default(i))
|
||||
continue;
|
||||
fprintf(f, "\t%s = ", parm_table[i].label);
|
||||
lpcfg_print_parameter(&parm_table[i], lp_parm_ptr(NULL,
|
||||
@ -4164,7 +4164,7 @@ void lp_dump(FILE *f, bool show_defaults, int maxtoprint)
|
||||
if (show_defaults)
|
||||
defaults_saved = false;
|
||||
|
||||
dump_globals(f);
|
||||
dump_globals(f, defaults_saved);
|
||||
|
||||
dump_a_service(&sDefault, f, show_defaults);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user