conf: add ARG_INT2 arg type

This get things ready for introducing the servo-pi config option, which takes two comma separated integers. Signed-off-by: Davide Ciminaghi <ciminaghi@gnudd.com>

conf: add ARG_INT2 arg type
This get things ready for introducing the servo-pi config option, which takes two comma separated integers. Signed-off-by: Davide Ciminaghi <ciminaghi@gnudd.com>
dff43b05 · Davide Ciminaghi · Alessandro Rubini · dd0e6972 · dff43b05 · dff43b05
Commit dff43b05 authored Mar 02, 2016 by Davide Ciminaghi Committed by Alessandro Rubini Apr 08, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

ppsi.h include/ppsi/ppsi.h +2 -0

conf.c lib/conf.c +8 -0

No files found.
--- a/include/ppsi/ppsi.h
+++ b/include/ppsi/ppsi.h
@@ -278,6 +278,7 @@ struct pp_cfg_time {
 * added inside here, without redefining cfg_handler prototype */
 union pp_cfg_arg {
 	int i;
+	int i2[2];
 	char *s;
 	struct pp_cfg_time ts;
 };
@@ -295,6 +296,7 @@ struct pp_argname {
 enum pp_argtype {
 	ARG_NONE,
 	ARG_INT,
+	ARG_INT2,
 	ARG_STR,
 	ARG_NAMES,
 	ARG_TIME,

--- a/lib/conf.c
+++ b/lib/conf.c
@@ -380,6 +380,14 @@ static int pp_config_line(struct pp_globals *ppg, char *line, int lineno)
 		}
 		break;

+	case ARG_INT2:
+		if (sscanf(line, "%i,%i", cfg_arg.i2, &cfg_arg.i2[1]) < 0) {
+			pp_diag(NULL, config, 1, "line %i: wrong arg \"%s\""
+				" for \"%s\"\n", lineno, line, word);
+			return -1;
+		}
+		break;
+
 	case ARG_STR:
 		while (*line && blank(*line))
 			line++;