diff options
| author | Michael Brown | 2013-07-18 14:35:19 +0200 |
|---|---|---|
| committer | Michael Brown | 2013-07-18 16:50:02 +0200 |
| commit | 063645118ce1f73e143bb17a74bd678d31d7563e (patch) | |
| tree | d8333d35499f3cf62321595400bc49e8b27cdf2c /src/core/settings.c | |
| parent | [build] Fix %.licence build target (diff) | |
| download | ipxe-063645118ce1f73e143bb17a74bd678d31d7563e.tar.gz ipxe-063645118ce1f73e143bb17a74bd678d31d7563e.tar.xz ipxe-063645118ce1f73e143bb17a74bd678d31d7563e.zip | |
[settings] Clarify usage of the term "named setting"
There are currently two conflicting usages of the term "named setting"
within iPXE: one refers to predefined settings (such as show up in the
"config" UI), the other refers to settings identified by a name (such
as "net0.dhcp/ip").
Split these usages into the term "predefined setting" and "named
setting" to avoid ambiguity.
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/core/settings.c')
| -rw-r--r-- | src/core/settings.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/core/settings.c b/src/core/settings.c index 8cdabe09..6d0c854f 100644 --- a/src/core/settings.c +++ b/src/core/settings.c @@ -262,7 +262,7 @@ static void autovivified_settings_free ( struct refcnt *refcnt ) { } /** - * Find child named settings block + * Find child settings block * * @v parent Parent settings block * @v name Name within this parent @@ -289,7 +289,7 @@ struct settings * find_child_settings ( struct settings *parent, } /** - * Find or create child named settings block + * Find or create child settings block * * @v parent Parent settings block * @v name Name within this parent @@ -383,7 +383,7 @@ parse_settings_name ( const char *name, } /** - * Find named settings block + * Find settings block * * @v name Name * @ret settings Settings block, or NULL @@ -1113,10 +1113,10 @@ int storef_setting ( struct settings *settings, struct setting *setting, */ /** - * Find named setting + * Find predefined setting * * @v name Name - * @ret setting Named setting, or NULL + * @ret setting Setting, or NULL */ struct setting * find_setting ( const char *name ) { struct setting *setting; @@ -1192,7 +1192,7 @@ parse_setting_name ( const char *name, char *settings_name; char *setting_name; char *type_name; - struct setting *named_setting; + struct setting *predefined; /* Set defaults */ *settings = &settings_root; @@ -1226,10 +1226,10 @@ parse_setting_name ( const char *name, setting->tag = parse_setting_tag ( setting_name ); setting->scope = (*settings)->default_scope; setting->name = setting_name; - for_each_table_entry ( named_setting, SETTINGS ) { - /* Matches a defined named setting; use that setting */ - if ( setting_cmp ( named_setting, setting ) == 0 ) { - memcpy ( setting, named_setting, sizeof ( *setting ) ); + for_each_table_entry ( predefined, SETTINGS ) { + /* Matches a predefined setting; use that setting */ + if ( setting_cmp ( predefined, setting ) == 0 ) { + memcpy ( setting, predefined, sizeof ( *setting ) ); break; } } |