diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-26 15:46:06 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-07-07 23:32:35 +0200 |
| commit | bdbafe51daa1d338776b33197ba0fc53dc974827 (patch) | |
| tree | e4c83f97a2f05f8ac8c1b1dc439caa232bbe59c5 /source3/param | |
| parent | f1c28fcc23da3f4c8061d2db41fae90b14ca0494 (diff) | |
| download | samba-bdbafe51daa1d338776b33197ba0fc53dc974827.tar.gz samba-bdbafe51daa1d338776b33197ba0fc53dc974827.tar.xz samba-bdbafe51daa1d338776b33197ba0fc53dc974827.zip | |
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>
Diffstat (limited to 'source3/param')
| -rw-r--r-- | source3/param/loadparm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 4e6953440b..16d877d274 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -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); |