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

XML creation and parse API changes

Browse source
This commit is contained in:
Olof Hagsand 2017-12-09 14:14:40 +01:00
parent 056b5c97dd
commit 4742fde1e9
21 changed files with 309 additions and 258 deletions
Download patch file Download diff file Expand all files Collapse all files

6
datastore/text/clixon_xmldb_text.c
View file

@ -431,7 +431,7 @@ text_get(xmldb_handle xh,
goto done;
}
/* Parse file into XML tree */
if ((clicon_xml_parse_file(fd, "</config>", yspec, &xt)) < 0)
if ((xml_parse_file(fd, "</config>", yspec, &xt)) < 0)
goto done;
/* Always assert a top-level called "config".
To ensure that, deal with two cases:
@ -856,7 +856,7 @@ text_put(xmldb_handle xh,
goto done;
}
/* Parse file into XML tree */
if ((clicon_xml_parse_file(fd, "</config>", yspec, &x0)) < 0)
if ((xml_parse_file(fd, "</config>", yspec, &x0)) < 0)
goto done;
/* Always assert a top-level called "config".
To ensure that, deal with two cases:
@ -1345,7 +1345,7 @@ main(int argc, char **argv)
if (strcmp(cmd, "put")==0){
if (argc != 6)
usage(argv[0]);
if (clicon_xml_parse_file(0, "</clicon>", NULL, &xt) < 0)
if (xml_parse_file(0, "</clicon>", NULL, &xt) < 0)
goto done;
if (xml_rootchild(xt, 0, &xn) < 0)
goto done;