From a4f2f3a509ca7ce531c29e2761a3be2e43408b3f Mon Sep 17 00:00:00 2001 From: Garming Sam Date: Fri, 28 Feb 2014 10:16:05 +1300 Subject: param: allow fallback to s3 do_section in lib/param This means that pm_process will eventually only call one do_section method. Change-Id: I81ffd0d61783df3e6c267f06210d4180a291ab4c Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett Reviewed-by: Nadezhda Ivanova --- lib/param/loadparm.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index d030d0b3eb..bda014319c 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -1899,8 +1899,15 @@ static bool do_section(const char *pszSectionName, void *userdata) { struct loadparm_context *lp_ctx = (struct loadparm_context *)userdata; bool bRetval; - bool isglobal = ((strwicmp(pszSectionName, GLOBAL_NAME) == 0) || + bool isglobal; + + if (lp_ctx->s3_fns != NULL) { + return lp_ctx->s3_fns->do_section(pszSectionName, lp_ctx); + } + + isglobal = ((strwicmp(pszSectionName, GLOBAL_NAME) == 0) || (strwicmp(pszSectionName, GLOBAL_NAME2) == 0)); + bRetval = false; /* if we've just struck a global section, note the fact. */ -- cgit