From 67b45186a572fb051e73fd88d4fc580a0d4d2f6b Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 1 Dec 2010 16:34:23 +0000 Subject: [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 --- src/core/nvo.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/core/nvo.c') diff --git a/src/core/nvo.c b/src/core/nvo.c index 00f2d9ffc..1a886c0f8 100644 --- a/src/core/nvo.c +++ b/src/core/nvo.c @@ -204,8 +204,7 @@ void nvo_init ( struct nvo_block *nvo, struct nvs_device *nvs, struct nvo_fragment *fragments, struct refcnt *refcnt ) { nvo->nvs = nvs; nvo->fragments = fragments; - settings_init ( &nvo->settings, &nvo_settings_operations, refcnt, - "nvo", 0 ); + settings_init ( &nvo->settings, &nvo_settings_operations, refcnt, 0 ); } /** @@ -250,7 +249,7 @@ int register_nvo ( struct nvo_block *nvo, struct settings *parent ) { /* Verify and register options */ nvo_init_dhcpopts ( nvo ); - if ( ( rc = register_settings ( &nvo->settings, parent ) ) != 0 ) + if ( ( rc = register_settings ( &nvo->settings, parent, "nvo" ) ) != 0 ) goto err_register; DBGC ( nvo, "NVO %p registered\n", nvo ); -- cgit v1.2.3-55-g7522