[settings] Apply settings block name in register_settings()

Pass the settings block name as a parameter to register_settings(),
rather than defining it with settings_init() (and then possibly
changing it by directly manipulating settings->name).

Signed-off-by: Michael Brown <mcb30@ipxe.org>

1 files changed, 8 insertions, 3 deletions

diff --git a/src/core/settings.c b/src/core/settings.c
index 8a3660ef..816ae141 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -281,9 +281,9 @@ static struct settings * autovivify_child_settings ( struct settings *parent,
 		return NULL;
 	}
 	memcpy ( new_child->name, name, sizeof ( new_child->name ) );
-	generic_settings_init ( &new_child->generic, NULL, new_child->name );
+	generic_settings_init ( &new_child->generic, NULL );
 	settings = &new_child->generic.settings;
-	register_settings ( settings, parent );
+	register_settings ( settings, parent, new_child->name );
 	return settings;
 }
 
@@ -422,9 +422,11 @@ static void reprioritise_settings ( struct settings *settings ) {
  *
  * @v settings		Settings block
  * @v parent		Parent settings block, or NULL
+ * @v name		Settings block name
  * @ret rc		Return status code
  */
-int register_settings ( struct settings *settings, struct settings *parent ) {
+int register_settings ( struct settings *settings, struct settings *parent,
+			const char *name ) {
 	struct settings *old_settings;
 
 	/* NULL parent => add to settings root */
@@ -432,6 +434,9 @@ int register_settings ( struct settings *settings, struct settings *parent ) {
 	if ( parent == NULL )
 		parent = &settings_root;
 
+	/* Apply settings block name */
+	settings->name = name;
+
 	/* Remove any existing settings with the same name */
 	if ( ( old_settings = find_child_settings ( parent, settings->name ) ))
 		unregister_settings ( old_settings );