chao
/
linuxptp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config: refactor the parsing code. 

Now that all of the legacy parsing code is gone, there remain two
identical parsing functions.  This patch removes them both and places
the common code at the original call site.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
master
Richard Cochran 2015-08-22 22:09:03 +02:00
parent 1e9ffd50ae
commit 70ea3f3f32
1 changed files with 13 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
config.c
View File

@ -237,6 +237,10 @@ struct config_item config_tab[] = {
GLOB_ITEM_INT("verbose", 0, 0, 1), GLOB_ITEM_INT("verbose", 0, 0, 1),
}; };
static enum parser_result
parse_fault_interval(struct config *cfg, const char *section,
const char *option, const char *value);
static struct config_item *config_section_item(struct config *cfg, static struct config_item *config_section_item(struct config *cfg,
const char *section, const char *section,
const char *name) const char *name)
@ -326,12 +330,18 @@ static enum parser_result parse_item(struct config *cfg,
const char *option, const char *option,
const char *value) const char *value)
{ {
enum parser_result r = BAD_VALUE; enum parser_result r;
struct config_item *cgi, *dst; struct config_item *cgi, *dst;
struct config_enum *cte; struct config_enum *cte;
double df; double df;
int val; int val;
r = parse_fault_interval(cfg, section, option, value);
if (r != NOT_PARSED)
return r;
r = BAD_VALUE;
/* If there is no default value, then the option is bogus. */ /* If there is no default value, then the option is bogus. */
cgi = config_global_item(cfg, option); cgi = config_global_item(cfg, option);
if (!cgi) { if (!cgi) {
@ -436,33 +446,6 @@ static enum parser_result parse_fault_interval(struct config *cfg,
return NOT_PARSED; return NOT_PARSED;
} }
static enum parser_result parse_port_setting(struct config *cfg,
const char *option,
const char *value,
struct interface *iface)
{
enum parser_result r;
r = parse_fault_interval(cfg, iface->name, option, value);
if (r != NOT_PARSED)
return r;
return parse_item(cfg, iface->name, option, value);
}
static enum parser_result parse_global_setting(const char *option,
const char *value,
struct config *cfg)
{
enum parser_result r;
r = parse_fault_interval(cfg, NULL, option, value);
if (r != NOT_PARSED)
return r;
return parse_item(cfg, NULL, option, value);
}
static enum parser_result parse_setting_line(char *line, static enum parser_result parse_setting_line(char *line,
const char **option, const char **option,
const char **value) const char **value)
@ -569,10 +552,8 @@ int config_read(char *name, struct config *cfg)
check_deprecated_options(&option); check_deprecated_options(&option);
if (current_section == GLOBAL_SECTION) parser_res = parse_item(cfg, current_section == GLOBAL_SECTION ?
parser_res = parse_global_setting(option, value, cfg); NULL : current_port->name, option, value);
else
parser_res = parse_port_setting(cfg, option, value, current_port);
switch (parser_res) { switch (parser_res) {
case PARSED_OK: case PARSED_OK: