sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-22 04:50:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

[settings] Display canonical setting name in "config" user interface

Browse Source 
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2011-03-22 21:24:54 +00:00
parent 48b66e4f1a
commit 247ac80556
3 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/core/settings.c
View File

@@ -1060,6 +1060,27 @@ parse_setting_name ( const char *name,
return 0;
}
/**
* Return full setting name
*
* @v settings Settings block, or NULL
* @v setting Setting
* @v buf Buffer
* @v len Length of buffer
* @ret len Length of setting name, or negative error
*/
int setting_name ( struct settings *settings, struct setting *setting,
char *buf, size_t len ) {
const char *name;
if ( ! settings )
settings = &settings_root;
name = settings_name ( settings );
return snprintf ( buf, len, "%s%s%s:%s", name, ( name[0] ? "/" : "" ),
setting->name, setting->type->name );
}
/**
* Parse and store value of named setting
*
@@ -1101,7 +1122,6 @@ int fetchf_named_setting ( const char *name,
struct settings *settings;
struct setting setting;
struct settings *origin;
const char *origin_name;
char tmp_name[ strlen ( name ) + 1 ];
int rc;
@@ -1118,10 +1138,7 @@ int fetchf_named_setting ( const char *name,
/* Construct setting name */
origin = fetch_setting_origin ( settings, &setting );
assert ( origin != NULL );
origin_name = settings_name ( origin );
snprintf ( name_buf, name_len, "%s%s%s:%s",
origin_name, ( origin_name[0] ? "/" : "" ),
setting.name, setting.type->name );
setting_name ( origin, &setting, name_buf, name_len );
return 0;
}