Skip to content

Commit

Permalink
Remove redundant code
Browse files Browse the repository at this point in the history
Signed-off-by: Gavin Halliday <[email protected]>
  • Loading branch information
ghalliday committed Feb 2, 2024
1 parent 2eea434 commit 4b97b44
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions esp/platform/espp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -469,16 +469,7 @@ int init_main(int argc, const char* argv[])
envpt.setown(createPTreeFromXMLFile(cfgfile, ipt_caseInsensitive));

// NB: esp has no standard component config in bare-metal, this is loading defaultYaml only
espConfig.setown(loadConfiguration(defaultYaml, argv, "esp", "ESP", "esp.xml", extractLegacyOptions));

// legacy esp.xml will contain a generated global section if present in the environment.
// replace the empty stub created by loadConfiguration with this environment globals section.
Owned<IPropertyTree> global = envpt->getPropTree("global");
if (global)
{
Owned<IPropertyTree> currentConfig = getComponentConfig();
replaceComponentConfig(currentConfig, global);
}
espConfig.setown(loadConfiguration(defaultYaml, argv, "esp", "ESP", cfgfile, extractLegacyOptions));
}
Owned<IPropertyTree> procpt = NULL;
if (envpt)
Expand Down

0 comments on commit 4b97b44

Please sign in to comment.