narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[settings] Eliminate call to storef_named_setting() in choose_exec() 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/598/head
Michael Brown 2013-07-18 15:49:32 +01:00
parent 1625a8c05f
commit 7010b10491
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/hci/commands/menu_cmd.c
View File

@ -228,9 +228,9 @@ static struct command_descriptor choose_cmd =
*/ */
static int choose_exec ( int argc, char **argv ) { static int choose_exec ( int argc, char **argv ) {
struct choose_options opts; struct choose_options opts;
struct named_setting setting;
struct menu *menu; struct menu *menu;
struct menu_item *item; struct menu_item *item;
const char *setting;
int rc; int rc;
/* Parse options */ /* Parse options */
@ -238,7 +238,9 @@ static int choose_exec ( int argc, char **argv ) {
goto err_parse_options; goto err_parse_options;
/* Parse setting name */ /* Parse setting name */
setting = argv[optind]; if ( ( rc = parse_autovivified_setting ( argv[optind],
&setting ) ) != 0 )
goto err_parse_setting;
/* Identify menu */ /* Identify menu */
if ( ( rc = parse_menu ( opts.menu, &menu ) ) != 0 ) if ( ( rc = parse_menu ( opts.menu, &menu ) ) != 0 )
@ -248,11 +250,15 @@ static int choose_exec ( int argc, char **argv ) {
if ( ( rc = show_menu ( menu, opts.timeout, opts.select, &item ) ) != 0) if ( ( rc = show_menu ( menu, opts.timeout, opts.select, &item ) ) != 0)
goto err_show_menu; goto err_show_menu;
/* Apply default type if necessary */
if ( ! setting.setting.type )
setting.setting.type = &setting_type_string;
/* Store setting */ /* Store setting */
if ( ( rc = storef_named_setting ( setting, &setting_type_string, if ( ( rc = storef_setting ( setting.settings, &setting.setting,
item->label ) ) != 0 ) { item->label ) ) != 0 ) {
printf ( "Could not store \"%s\": %s\n", printf ( "Could not store \"%s\": %s\n",
setting, strerror ( rc ) ); setting.setting.name, strerror ( rc ) );
goto err_store; goto err_store;
} }
@ -265,6 +271,7 @@ static int choose_exec ( int argc, char **argv ) {
if ( ! opts.keep ) if ( ! opts.keep )
destroy_menu ( menu ); destroy_menu ( menu );
err_parse_menu: err_parse_menu:
err_parse_setting:
err_parse_options: err_parse_options:
return rc; return rc;
} }