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

stricter xml populate made some cornercase errors appear

Browse source
This commit is contained in:
Olof hagsand 2020-03-05 11:56:13 +01:00
parent bab3b5ad56
commit 3855508622
4 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
util/clixon_util_xml.c
View file

@ -161,6 +161,7 @@ main(int argc,
char *top_path = NULL;
cxobj *xbot; /* Place in xtop where base cxobj is parsed */
cvec *nsc = NULL;
enum yang_bind yb;
/* In the startup, logs to stderr & debug flag set later */
clicon_log_init(__FILE__, LOG_INFO, CLICON_LOG_STDERR);
@ -291,7 +292,13 @@ main(int argc,
}
}
else{ /* XML */
if ((ret = xml_parse_file2(fd, (xt==NULL)?YB_TOP:YB_PARENT, yspec, NULL, &xt, &xerr)) < 0){
if (!yang_file_dir)
yb = YB_NONE;
else if (xt == NULL)
yb = YB_TOP;
else
yb = YB_PARENT;
if ((ret = xml_parse_file2(fd, yb, yspec, NULL, &xt, &xerr)) < 0){
fprintf(stderr, "xml parse error: %s\n", clicon_err_reason);
goto done;
}