Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

path: simplify configuration file

Browse source
This commit is contained in:
Steffen Vogel 2017-05-07 22:57:11 +02:00
parent 560f2f5423
commit 52d4aceb4f
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/path.c
View file

@ -200,10 +200,7 @@ int path_parse(struct path *p, config_setting_t *cfg, struct list *nodes)
list_init(&destinations);
/* Input node */
if (!config_setting_lookup_string(cfg, "in", &in) &&
!config_setting_lookup_string(cfg, "from", &in) &&
!config_setting_lookup_string(cfg, "src", &in) &&
!config_setting_lookup_string(cfg, "source", &in))
if (!config_setting_lookup_string(cfg, "in", &in))
cerror(cfg, "Missing input node for path");
source = list_lookup(nodes, in);
@ -211,11 +208,8 @@ int path_parse(struct path *p, config_setting_t *cfg, struct list *nodes)
cerror(cfg, "Invalid input node '%s'", in);
/* Output node(s) */
if (!(cfg_out = config_setting_get_member(cfg, "out")) &&
!(cfg_out = config_setting_get_member(cfg, "to")) &&
!(cfg_out = config_setting_get_member(cfg, "dst")) &&
!(cfg_out = config_setting_get_member(cfg, "dest")) &&
!(cfg_out = config_setting_get_member(cfg, "sink")))
cfg_out = config_setting_get_member(cfg, "out");
if (!cfg_out)
cerror(cfg, "Missing output nodes for path");
ret = node_parse_list(&destinations, cfg_out, nodes);