Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[parseopt] Move parse_settings() to parseopt.c
Signed-off-by: Michael Brown <mcb30@ipxe.org>
  • Loading branch information
mcb30 committed Jul 22, 2013
1 parent b87020a commit 46433f9
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 23 deletions.
23 changes: 23 additions & 0 deletions src/core/parseopt.c
Expand Up @@ -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
Expand Down Expand Up @@ -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
*
Expand Down
22 changes: 0 additions & 22 deletions src/hci/commands/config_cmd.c
Expand Up @@ -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
*
Expand Down
3 changes: 2 additions & 1 deletion src/include/ipxe/parseopt.h
Expand Up @@ -14,6 +14,7 @@ FILE_LICENCE ( GPL2_OR_LATER );

struct net_device;
struct menu;
struct settings;

/** A command-line option descriptor */
struct option_descriptor {
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 46433f9

Please sign in to comment.