diff options
| author | Michael Brown | 2010-12-01 17:34:23 +0100 |
|---|---|---|
| committer | Michael Brown | 2010-12-01 17:35:00 +0100 |
| commit | 67b45186a572fb051e73fd88d4fc580a0d4d2f6b (patch) | |
| tree | 9c1b23f9ceab3f9e9bf3ca0563103bc6230c0ee5 /src/core/nvo.c | |
| parent | [iscsi] Disambiguate the common EINVAL cases (diff) | |
| download | ipxe-67b45186a572fb051e73fd88d4fc580a0d4d2f6b.tar.gz ipxe-67b45186a572fb051e73fd88d4fc580a0d4d2f6b.tar.xz ipxe-67b45186a572fb051e73fd88d4fc580a0d4d2f6b.zip | |
[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>
Diffstat (limited to 'src/core/nvo.c')
| -rw-r--r-- | src/core/nvo.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/nvo.c b/src/core/nvo.c index 00f2d9ff..1a886c0f 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 ); |