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/arch/i386/interface | |
| 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/arch/i386/interface')
| -rw-r--r-- | src/arch/i386/interface/vmware/guestinfo.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/arch/i386/interface/vmware/guestinfo.c b/src/arch/i386/interface/vmware/guestinfo.c index da013ca28..8ce363aaf 100644 --- a/src/arch/i386/interface/vmware/guestinfo.c +++ b/src/arch/i386/interface/vmware/guestinfo.c @@ -58,7 +58,7 @@ static int guestinfo_fetch_type ( struct settings *settings, strlen ( parent_name ) + 1 /* "." */ + strlen ( setting->name ) + 1 /* "." */ + ( type ? strlen ( type->name ) : 0 ) + 1 /* NUL */ ]; - struct setting *named_setting; + struct setting *predefined; char *info; int info_len; int check_len; @@ -82,9 +82,8 @@ static int guestinfo_fetch_type ( struct settings *settings, /* Determine default type if necessary */ if ( ! type ) { - named_setting = find_setting ( setting->name ); - type = ( named_setting ? - named_setting->type : &setting_type_string ); + predefined = find_setting ( setting->name ); + type = ( predefined ? predefined->type : &setting_type_string ); } assert ( type != NULL ); |