sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-17 01:52:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

[settings] Remove default_type parameter from parse_setting_name()

Browse Source 
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2013-07-19 14:08:13 +01:00
parent 78178608e9
commit 77c70ac0cd
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/core/settings.c
View File

@@ -1063,6 +1063,10 @@ int fetchf_setting ( struct settings *settings, struct setting *setting,
goto err_exists; goto err_exists;
} }
/* Sanity check */
assert ( setting->type != NULL );
assert ( setting->type->format != NULL );
/* Format setting */ /* Format setting */
if ( ( ret = setting->type->format ( raw, raw_len, buf, len ) ) < 0 ) if ( ( ret = setting->type->format ( raw, raw_len, buf, len ) ) < 0 )
goto err_format; goto err_format;
@@ -1093,6 +1097,10 @@ int storef_setting ( struct settings *settings, struct setting *setting,
if ( ( ! value ) || ( ! value[0] ) ) if ( ( ! value ) || ( ! value[0] ) )
return delete_setting ( settings, setting ); return delete_setting ( settings, setting );
/* Sanity check */
assert ( setting->type != NULL );
assert ( setting->type->parse != NULL );
/* Get raw value length */ /* Get raw value length */
raw_len = setting->type->parse ( value, NULL, 0 ); raw_len = setting->type->parse ( value, NULL, 0 );
if ( raw_len < 0 ) { if ( raw_len < 0 ) {
@@ -1188,7 +1196,6 @@ static struct setting_type * find_setting_type ( const char *name ) {
* @v get_child Function to find or create child settings block * @v get_child Function to find or create child settings block
* @v settings Settings block to fill in * @v settings Settings block to fill in
* @v setting Setting to fill in * @v setting Setting to fill in
* @v default_type Default type to use, if none specified
* @ret rc Return status code * @ret rc Return status code
* *
* Interprets a name of the form * Interprets a name of the form
@@ -1203,8 +1210,7 @@ parse_setting_name ( char *name,
struct settings * ( * get_child ) struct settings * ( * get_child )
( struct settings *settings, ( struct settings *settings,
const char *name ), const char *name ),
struct settings **settings, struct setting *setting, struct settings **settings, struct setting *setting ) {
struct setting_type *default_type ) {
char *settings_name; char *settings_name;
char *setting_name; char *setting_name;
char *type_name; char *type_name;
@@ -1215,7 +1221,6 @@ parse_setting_name ( char *name,
*settings = &settings_root; *settings = &settings_root;
memset ( setting, 0, sizeof ( *setting ) ); memset ( setting, 0, sizeof ( *setting ) );
setting->name = ""; setting->name = "";
setting->type = default_type;
/* Split name into "[settings_name/]setting_name[:type_name]" */ /* Split name into "[settings_name/]setting_name[:type_name]" */
if ( ( setting_name = strchr ( name, '/' ) ) != NULL ) { if ( ( setting_name = strchr ( name, '/' ) ) != NULL ) {
@@ -1313,10 +1318,13 @@ int store_named_setting ( const char *name, struct setting_type *default_type,
/* Parse setting name */ /* Parse setting name */
if ( ( rc = parse_setting_name ( tmp_name, autovivify_child_settings, if ( ( rc = parse_setting_name ( tmp_name, autovivify_child_settings,
&settings, &setting, &settings, &setting ) ) != 0 )
default_type ) ) != 0 )
return rc; return rc;
/* Apply default type if necessary */
if ( ! setting.type )
setting.type = default_type;
/* Store setting */ /* Store setting */
if ( ( rc = store_setting ( settings, &setting, data, len ) ) != 0 ) if ( ( rc = store_setting ( settings, &setting, data, len ) ) != 0 )
return rc; return rc;
@@ -1344,10 +1352,13 @@ int storef_named_setting ( const char *name, struct setting_type *default_type,
/* Parse setting name */ /* Parse setting name */
if ( ( rc = parse_setting_name ( tmp_name, autovivify_child_settings, if ( ( rc = parse_setting_name ( tmp_name, autovivify_child_settings,
&settings, &setting, &settings, &setting ) ) != 0 )
default_type ) ) != 0 )
return rc; return rc;
/* Apply default type if necessary */
if ( ! setting.type )
setting.type = default_type;
/* Store setting */ /* Store setting */
if ( ( rc = storef_setting ( settings, &setting, value ) ) != 0 ) if ( ( rc = storef_setting ( settings, &setting, value ) ) != 0 )
return rc; return rc;
@@ -1380,7 +1391,7 @@ int fetchf_named_setting ( const char *name,
/* Parse setting name */ /* Parse setting name */
if ( ( rc = parse_setting_name ( tmp_name, find_child_settings, if ( ( rc = parse_setting_name ( tmp_name, find_child_settings,
&settings, &setting, NULL ) ) != 0 ) &settings, &setting ) ) != 0 )
return rc; return rc;
/* Fetch setting */ /* Fetch setting */