Skip to content

P
PPSi
Commit f68e4b71 authored by Pietro Fezzardi's avatar Pietro Fezzardi
Browse files
Options

configuration: new prototype for cfg_handler 

in ppsi.h. This allows to pass only a single argument to cfg_handlers
configuration functions.
Definitions of functions and arguments have been updated in lib/conf.c to
follow this changes.
parent 7c298149
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 23 deletions
include/ppsi/ppsi.h
View file @ f68e4b71
...@@ -256,10 +256,18 @@ extern int pp_close_globals(struct pp_globals *ppg); ...@@ -256,10 +256,18 @@ extern int pp_close_globals(struct pp_globals *ppg);
extern int pp_parse_cmdline(struct pp_globals *ppg, int argc, char **argv); extern int pp_parse_cmdline(struct pp_globals *ppg, int argc, char **argv);
/* Data structure used to pass just a single argument to configuration
* functions. Any future new type for any new configuration function can be just
* added inside here, without redefining cfg_handler prototype */
union pp_cfg_arg {
int i;
char *s;
};
/* /*
* Configuration: we are structure-based, and a typedef simplifies things * Configuration: we are structure-based, and a typedef simplifies things
*/ */
typedef int (*cfg_handler)(int lineno, int iarg, char *sarg); typedef int (*cfg_handler)(int lineno, union pp_cfg_arg *arg);
struct pp_argname { struct pp_argname {
char *name; char *name;
......
lib/conf.c
View file @ f68e4b71
...@@ -19,14 +19,14 @@ static struct pp_globals *current_ppg; ...@@ -19,14 +19,14 @@ static struct pp_globals *current_ppg;
static struct pp_instance *current_ppi; static struct pp_instance *current_ppi;
/* A "port" (or "link", for compatibility) line creates or uses a pp instance */ /* A "port" (or "link", for compatibility) line creates or uses a pp instance */
static int f_port(int lineno, int iarg, char *sarg) static int f_port(int lineno, union pp_cfg_arg *arg)
{ {
int i; int i;
/* First look for an existing port with the same name */ /* First look for an existing port with the same name */
for (i = 0; i < current_ppg->nlinks; i++) { for (i = 0; i < current_ppg->nlinks; i++) {
current_ppi = current_ppg->pp_instances + i; current_ppi = current_ppg->pp_instances + i;
if (!strcmp(sarg, current_ppi->cfg.port_name)) if (!strcmp(arg->s, current_ppi->cfg.port_name))
return 0; return 0;
} }
/* Allocate a new ppi */ /* Allocate a new ppi */
...@@ -38,7 +38,7 @@ static int f_port(int lineno, int iarg, char *sarg) ...@@ -38,7 +38,7 @@ static int f_port(int lineno, int iarg, char *sarg)
current_ppi = current_ppg->pp_instances + current_ppg->nlinks; current_ppi = current_ppg->pp_instances + current_ppg->nlinks;
/* FIXME: strncpy (it is missing in bare archs by now) */ /* FIXME: strncpy (it is missing in bare archs by now) */
strcpy(current_ppi->cfg.port_name, sarg); strcpy(current_ppi->cfg.port_name, arg->s);
current_ppg->nlinks++; current_ppg->nlinks++;
return 0; return 0;
} }
...@@ -54,54 +54,54 @@ static int f_port(int lineno, int iarg, char *sarg) ...@@ -54,54 +54,54 @@ static int f_port(int lineno, int iarg, char *sarg)
return -1; \ return -1; \
}}) }})
static int f_if(int lineno, int iarg, char *sarg) static int f_if(int lineno, union pp_cfg_arg *arg)
{ {
CHECK_PPI(1); CHECK_PPI(1);
strcpy(current_ppi->cfg.iface_name, sarg); strcpy(current_ppi->cfg.iface_name, arg->s);
return 0; return 0;
} }
/* The following ones are so similar. Bah... set a pointer somewhere? */ /* The following ones are so similar. Bah... set a pointer somewhere? */
static int f_proto(int lineno, int iarg, char *sarg) static int f_proto(int lineno, union pp_cfg_arg *arg)
{ {
CHECK_PPI(1); CHECK_PPI(1);
current_ppi->cfg.proto = iarg; current_ppi->cfg.proto = arg->i;
return 0; return 0;
} }
static int f_role(int lineno, int iarg, char *sarg) static int f_role(int lineno, union pp_cfg_arg *arg)
{ {
CHECK_PPI(1); CHECK_PPI(1);
current_ppi->cfg.role = iarg; current_ppi->cfg.role = arg->i;
return 0; return 0;
} }
static int f_ext(int lineno, int iarg, char *sarg) static int f_ext(int lineno, union pp_cfg_arg *arg)
{ {
CHECK_PPI(1); CHECK_PPI(1);
current_ppi->cfg.ext = iarg; current_ppi->cfg.ext = arg->i;
return 0; return 0;
} }
/* The following two are identical as well. I really need a pointer... */ /* The following two are identical as well. I really need a pointer... */
static int f_class(int lineno, int iarg, char *sarg) static int f_class(int lineno, union pp_cfg_arg *arg)
{ {
CHECK_PPI(0); CHECK_PPI(0);
GOPTS(current_ppg)->clock_quality.clockClass = iarg; GOPTS(current_ppg)->clock_quality.clockClass = arg->i;
return 0; return 0;
} }
static int f_accuracy(int lineno, int iarg, char *sarg) static int f_accuracy(int lineno, union pp_cfg_arg *arg)
{ {
CHECK_PPI(0); CHECK_PPI(0);
GOPTS(current_ppg)->clock_quality.clockAccuracy = iarg; GOPTS(current_ppg)->clock_quality.clockAccuracy = arg->i;
return 0; return 0;
} }
/* Diagnostics can be per-port or global */ /* Diagnostics can be per-port or global */
static int f_diag(int lineno, int iarg, char *sarg) static int f_diag(int lineno, union pp_cfg_arg *arg)
{ {
unsigned long level = pp_diag_parse(sarg); unsigned long level = pp_diag_parse(arg->s);
if (current_ppi) if (current_ppi)
current_ppi->flags = level; current_ppi->flags = level;
...@@ -181,10 +181,10 @@ static char *first_word(char *line, char **rest) ...@@ -181,10 +181,10 @@ static char *first_word(char *line, char **rest)
static int pp_config_line(struct pp_globals *ppg, char *line, int lineno) static int pp_config_line(struct pp_globals *ppg, char *line, int lineno)
{ {
union pp_cfg_arg cfg_arg;
struct pp_argline *l; struct pp_argline *l;
struct pp_argname *n; struct pp_argname *n;
char *word; char *word;
int i;
current_ppg = ppg; current_ppg = ppg;
pp_diag(NULL, config, 2, "parsing line %i: \"%s\"\n", lineno, line); pp_diag(NULL, config, 2, "parsing line %i: \"%s\"\n", lineno, line);
...@@ -224,19 +224,21 @@ static int pp_config_line(struct pp_globals *ppg, char *line, int lineno) ...@@ -224,19 +224,21 @@ static int pp_config_line(struct pp_globals *ppg, char *line, int lineno)
break; break;
case ARG_INT: case ARG_INT:
if (sscanf(line, "%i", &i) != 1) { if (sscanf(line, "%i", &(cfg_arg.i)) != 1) {
pp_diag(NULL, config, 1, "line %i: \"%s\": not int\n", pp_diag(NULL, config, 1, "line %i: \"%s\": not int\n",
lineno, word); lineno, word);
return -1; return -1;
} }
if (l->f(lineno, i, NULL)) if (l->f(lineno, &cfg_arg))
return -1; return -1;
break; break;
case ARG_STR: case ARG_STR:
while (*line && *line == ' ' && *line == '\t') while (*line && *line == ' ' && *line == '\t')
line++; line++;
if (l->f(lineno, 0, line))
cfg_arg.s = line;
if (l->f(lineno, &cfg_arg))
return -1; return -1;
break; break;
...@@ -249,7 +251,8 @@ static int pp_config_line(struct pp_globals *ppg, char *line, int lineno) ...@@ -249,7 +251,8 @@ static int pp_config_line(struct pp_globals *ppg, char *line, int lineno)
" for \"%s\"\n", lineno, line, word); " for \"%s\"\n", lineno, line, word);
return -1; return -1;
} }
if (l->f(lineno, n->value, NULL)) cfg_arg.i = n->value;
if (l->f(lineno, &cfg_arg))
return -1; return -1;
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment