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

* xml_merge() changed to use 3-value return: 1:OK, 0:Yang failed, -1: Error

Browse source 
* `clixon_netconf_error(category, xerr, msg, arg)` removed first argument -> `clixon_netconf_error(xerr, msg, arg)`
* Renamed utility function `clixon_util_insert()` to `clixon_util_xml_mod()` and added merge functionality.
* Fixed: Insertion of subtree leaf nodes were not made in the crrect place, always ended up last regardless of yang spec (if ordered-by system).
This commit is contained in:
Olof hagsand 2020-04-17 15:47:37 +02:00
parent f401c07c4b
commit 0d4263e324
16 changed files with 376 additions and 274 deletions
Download patch file Download diff file Expand all files Collapse all files

8
util/clixon_util_xml.c
View file

@ -65,7 +65,7 @@
/* clixon */
#include "clixon/clixon.h"
/* Command line options to be passed to getopt(3) */
/* Command line options passed to getopt(3) */
#define UTIL_XML_OPTS "hD:f:Jjl:pvoy:Y:t:T:"
static int
@ -265,7 +265,7 @@ main(int argc,
goto done;
}
if (ret == 0){
clixon_netconf_error(OE_NETCONF, xerr, "Parse top file", NULL);
clixon_netconf_error(xerr, "Parse top file", NULL);
goto done;
}
if (validate_tree(h, xtop, yspec) < 0)
@ -291,7 +291,7 @@ main(int argc,
if ((ret = clixon_json_parse_file(fd, top_input_filename?YB_PARENT:YB_MODULE, yspec, &xt, &xerr)) < 0)
goto done;
if (ret == 0){
clixon_netconf_error(OE_NETCONF, xerr, "util_xml", NULL);
clixon_netconf_error(xerr, "util_xml", NULL);
goto done;
}
}
@ -307,7 +307,7 @@ main(int argc,
goto done;
}
if (ret == 0){
clixon_netconf_error(OE_NETCONF, xerr, "util_xml", NULL);
clixon_netconf_error(xerr, "util_xml", NULL);
goto done;
}
}