experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

config file has .xml ending, yang/clixon-config.yang is used as

Browse source 
model for an xml-based configuration file
This commit is contained in:
Olof hagsand 2017-09-25 22:05:26 +02:00
parent e45e8da6d7
commit 8494d29d6b
9 changed files with 154 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

31
lib/src/clixon_xml.c
View file

@ -1445,8 +1445,8 @@ cxvec_append(cxobj *x,
* @param[in] fn Callback
* @param[in] arg Argument
* @retval -1 Error, aborted at first error encounter
* @retval 0 OK, all nodes traversed
* @retval n OK, aborted at first encounter of first match
* @retval 0 OK, all nodes traversed (subparts may have been skipped)
* @retval 1 OK, aborted on first fn returned 1
*
* @code
* int x_fn(cxobj *x, void *arg)
@ -1471,12 +1471,18 @@ xml_apply(cxobj *xn,
x = NULL;
while ((x = xml_child_each(xn, x, type)) != NULL) {
if (fn(x, arg) < 0)
if ((ret = fn(x, arg)) < 0)
goto done;
if (ret == 2)
continue; /* Abort this node, dont recurse */
else if (ret == 1){
retval = 1;
goto done;
}
if ((ret = xml_apply(x, type, fn, arg)) < 0)
goto done;
if (ret > 0){
retval = ret;
if (ret == 1){
retval = 1;
goto done;
}
}
@ -1487,10 +1493,9 @@ xml_apply(cxobj *xn,
/*! Apply a function call on top object and all xml node children recursively
* @retval -1 Error, aborted at first error encounter
* @retval 0 OK, all nodes traversed
* @retval n OK, aborted at first encounter of first match
* @retval 0 OK, all nodes traversed (subparts may have been skipped)
* @retval 1 OK, aborted on first fn returned 1
* @see xml_apply not including top object
*/
int
xml_apply0(cxobj *xn,
@ -1501,11 +1506,13 @@ xml_apply0(cxobj *xn,
int retval = -1;
int ret;
if ((ret = fn(xn, arg)) < 0)
if ((ret = fn(xn, arg)) < 0) /* -1, 0, 1, 2 */
goto done;
if (ret > 0)
retval = ret;
else
if (ret == 1)
retval = 1;
else if (ret > 1)
retval = 0;
else /* 0 */
retval = xml_apply(xn, type, fn, arg);
done:
return retval;