lagertonne/ifupdown-ng
1
0
Fork 0
Code Issues Pull requests Projects Releases 4 Wiki Activity

cmd: use lif_interface_file_parse_state structure as needed

Browse source
This commit is contained in:
Ariadne Conill 2020-10-14 03:50:58 -06:00
parent 3bcfe91e84
commit dcb6ef97ef
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmd/ifquery.c
View file

@ -247,6 +247,9 @@ ifquery_main(int argc, char *argv[])
{ {
struct lif_dict state = {}; struct lif_dict state = {};
struct lif_dict collection = {}; struct lif_dict collection = {};
struct lif_interface_file_parse_state parse_state = {
.collection = &collection,
};
lif_interface_collection_init(&collection); lif_interface_collection_init(&collection);
@ -256,7 +259,7 @@ ifquery_main(int argc, char *argv[])
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if (!lif_interface_file_parse(&collection, exec_opts.interfaces_file)) if (!lif_interface_file_parse(&parse_state, exec_opts.interfaces_file))
{ {
fprintf(stderr, "%s: could not parse %s\n", argv0, exec_opts.interfaces_file); fprintf(stderr, "%s: could not parse %s\n", argv0, exec_opts.interfaces_file);
return EXIT_FAILURE; return EXIT_FAILURE;

5
cmd/ifupdown.c
View file

@ -237,6 +237,9 @@ ifupdown_main(int argc, char *argv[])
struct lif_dict state = {}; struct lif_dict state = {};
struct lif_dict collection = {}; struct lif_dict collection = {};
struct lif_interface_file_parse_state parse_state = {
.collection = &collection,
};
lif_interface_collection_init(&collection); lif_interface_collection_init(&collection);
@ -246,7 +249,7 @@ ifupdown_main(int argc, char *argv[])
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if (!lif_interface_file_parse(&collection, exec_opts.interfaces_file)) if (!lif_interface_file_parse(&parse_state, exec_opts.interfaces_file))
{ {
fprintf(stderr, "%s: could not parse %s\n", argv0, exec_opts.interfaces_file); fprintf(stderr, "%s: could not parse %s\n", argv0, exec_opts.interfaces_file);
return EXIT_FAILURE; return EXIT_FAILURE;