From a348fa95c12181f31c9a474e13b6715d238ac71c Mon Sep 17 00:00:00 2001 From: Garming Sam Date: Fri, 21 Mar 2014 10:44:15 +1300 Subject: [PATCH] param: allow dump_globals to check the actual defaults Change-Id: Ia5f30b6922b2e836d3e93403c61458ee58d993fd Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett Reviewed-by: Michael Adam --- lib/param/loadparm.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 6adeb7ed465..b9edff0ad1d 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -2041,8 +2041,16 @@ static void dump_globals(struct loadparm_context *lp_ctx, FILE *f, for (i = 0; parm_table[i].label; i++) if (parm_table[i].p_class == P_GLOBAL && (i == 0 || (parm_table[i].offset != parm_table[i - 1].offset))) { - if (!show_defaults && (lp_ctx->flags[i] & FLAG_DEFAULT)) - continue; + if (!show_defaults) { + if (lp_ctx->flags && (lp_ctx->flags[i] & FLAG_DEFAULT)) { + continue; + } + + if (is_default(lp_ctx->globals, i)) { + continue; + } + } + fprintf(f, "\t%s = ", parm_table[i].label); lpcfg_print_parameter(&parm_table[i], lpcfg_parm_ptr(lp_ctx, NULL, &parm_table[i]), f); fprintf(f, "\n"); -- 2.34.1