xCAT/xNBA
2
0
Fork 0
mirror of https://github.com/xcat2/xNBA.git synced 2024-11-25 11:00:15 +00:00
Code Issues Projects Releases Wiki Activity

[parseopt] Move parse_settings() to parseopt.c

Browse Source 
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown 2013-07-18 15:30:00 +01:00
parent b87020a090
commit 46433f9b5e
3 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/core/parseopt.c
View File

@ -28,6 +28,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <getopt.h>
#include <ipxe/netdevice.h>
#include <ipxe/menu.h>
#include <ipxe/settings.h>
#include <ipxe/parseopt.h>
/** @file
@ -172,6 +173,28 @@ int parse_key ( char *text, unsigned int *key ) {
return parse_integer ( text, key );
}
/**
* Parse settings block name
*
* @v text Text
* @ret value Integer value
* @ret rc Return status code
*/
int parse_settings ( char *text, struct settings **value ) {
/* Sanity check */
assert ( text != NULL );
/* Parse scope name */
*value = find_settings ( text );
if ( ! *value ) {
printf ( "\"%s\": no such scope\n", text );
return -EINVAL;
}
return 0;
}
/**
* Print command usage message
*

22
src/hci/commands/config_cmd.c
View File

@ -44,28 +44,6 @@ static struct option_descriptor config_opts[] = {};
static struct command_descriptor config_cmd =
COMMAND_DESC ( struct config_options, config_opts, 0, 1, "[<scope>]" );
/**
* Parse settings scope name
*
* @v text Text
* @ret value Integer value
* @ret rc Return status code
*/
static int parse_settings ( const char *text, struct settings **value ) {
/* Sanity check */
assert ( text != NULL );
/* Parse scope name */
*value = find_settings ( text );
if ( ! *value ) {
printf ( "\"%s\": no such scope\n", text );
return -EINVAL;
}
return 0;
}
/**
* "config" command
*

3
src/include/ipxe/parseopt.h
View File

@ -14,6 +14,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
struct net_device;
struct menu;
struct settings;
/** A command-line option descriptor */
struct option_descriptor {
@ -120,7 +121,7 @@ extern int parse_netdev ( char *text, struct net_device **netdev );
extern int parse_menu ( char *text, struct menu **menu );
extern int parse_flag ( char *text __unused, int *flag );
extern int parse_key ( char *text, unsigned int *key );
extern void print_usage ( struct command_descriptor *cmd, char **argv );
extern int parse_settings ( char *text, struct settings **settings );
extern int reparse_options ( int argc, char **argv,
struct command_descriptor *cmd, void *opts );
extern int parse_options ( int argc, char **argv,