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

interface-file: let commands initialize the interface collection themselves

Browse source
This commit is contained in:
Ariadne Conill 2020-08-20 03:45:56 -06:00
parent b57aba1a97
commit df9c0284b1
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/ifquery.c
View file

@ -275,6 +275,8 @@ ifquery_main(int argc, char *argv[])
struct lif_dict state = {}; struct lif_dict state = {};
struct lif_dict collection = {}; struct lif_dict collection = {};
lif_interface_collection_init(&collection);
if (!lif_state_read_path(&state, exec_opts.state_file)) if (!lif_state_read_path(&state, exec_opts.state_file))
{ {
fprintf(stderr, "%s: could not parse %s\n", argv0, exec_opts.state_file); fprintf(stderr, "%s: could not parse %s\n", argv0, exec_opts.state_file);

2
cmd/ifupdown.c
View file

@ -163,6 +163,8 @@ ifupdown_main(int argc, char *argv[])
struct lif_dict state = {}; struct lif_dict state = {};
struct lif_dict collection = {}; struct lif_dict collection = {};
lif_interface_collection_init(&collection);
if (!lif_state_read_path(&state, exec_opts.state_file)) if (!lif_state_read_path(&state, exec_opts.state_file))
{ {
fprintf(stderr, "%s: could not parse %s\n", argv0, exec_opts.state_file); fprintf(stderr, "%s: could not parse %s\n", argv0, exec_opts.state_file);

2
libifupdown/interface-file.c
View file

@ -117,8 +117,6 @@ keyword_cmp(const void *a, const void *b)
bool bool
lif_interface_file_parse(struct lif_dict *collection, const char *filename) lif_interface_file_parse(struct lif_dict *collection, const char *filename)
{ {
lif_interface_collection_init(collection);
FILE *f = fopen(filename, "r"); FILE *f = fopen(filename, "r");
if (f == NULL) if (f == NULL)
return false; return false;