[parseopt] Move parse_settings() to parseopt.c
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
parent
b87020a090
commit
46433f9b5e
|
@ -28,6 +28,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
|
||||||
#include <getopt.h>
|
#include <getopt.h>
|
||||||
#include <ipxe/netdevice.h>
|
#include <ipxe/netdevice.h>
|
||||||
#include <ipxe/menu.h>
|
#include <ipxe/menu.h>
|
||||||
|
#include <ipxe/settings.h>
|
||||||
#include <ipxe/parseopt.h>
|
#include <ipxe/parseopt.h>
|
||||||
|
|
||||||
/** @file
|
/** @file
|
||||||
|
@ -172,6 +173,28 @@ int parse_key ( char *text, unsigned int *key ) {
|
||||||
return parse_integer ( text, 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
|
* Print command usage message
|
||||||
*
|
*
|
||||||
|
|
|
@ -44,28 +44,6 @@ static struct option_descriptor config_opts[] = {};
|
||||||
static struct command_descriptor config_cmd =
|
static struct command_descriptor config_cmd =
|
||||||
COMMAND_DESC ( struct config_options, config_opts, 0, 1, "[<scope>]" );
|
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
|
* "config" command
|
||||||
*
|
*
|
||||||
|
|
|
@ -14,6 +14,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
|
||||||
|
|
||||||
struct net_device;
|
struct net_device;
|
||||||
struct menu;
|
struct menu;
|
||||||
|
struct settings;
|
||||||
|
|
||||||
/** A command-line option descriptor */
|
/** A command-line option descriptor */
|
||||||
struct 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_menu ( char *text, struct menu **menu );
|
||||||
extern int parse_flag ( char *text __unused, int *flag );
|
extern int parse_flag ( char *text __unused, int *flag );
|
||||||
extern int parse_key ( char *text, unsigned int *key );
|
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,
|
extern int reparse_options ( int argc, char **argv,
|
||||||
struct command_descriptor *cmd, void *opts );
|
struct command_descriptor *cmd, void *opts );
|
||||||
extern int parse_options ( int argc, char **argv,
|
extern int parse_options ( int argc, char **argv,
|
||||||
|
|
Reference in New Issue