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

* Improved submodule implementation, as part of [Yang submodule import prefix restrictions #60](https://github.com/clicon/clixon/issues/60).

Browse source
This commit is contained in:
Olof hagsand 2019-05-14 14:09:02 +02:00
parent 70221742f7
commit d775eb5374
10 changed files with 366 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/src/clixon_xml_map.c
View file

@ -2228,7 +2228,6 @@ xml_spec_populate(cxobj *x,
void *arg)
{
int retval = -1;
// clicon_handle h = (clicon_handle)arg;
yang_stmt *yspec = NULL; /* yang spec */
yang_stmt *y = NULL; /* yang node */
yang_stmt *yparent; /* yang parent */
@ -2237,8 +2236,6 @@ xml_spec_populate(cxobj *x,
char *name;
yspec = (yang_stmt*)arg;
if (xml_spec(x))
; // goto ok;
xp = xml_parent(x);
name = xml_name(x);
if (xp && (yparent = xml_spec(xp)) != NULL)
@ -2246,18 +2243,12 @@ xml_spec_populate(cxobj *x,
else if (yspec){
if (ys_module_by_xml(yspec, x, &ymod) < 0)
goto done;
/* ymod is "real" module, name may belong to included submodule */
if (ymod != NULL)
y = yang_find_schemanode(ymod, name);
}
if (y)
xml_spec_set(x, y);
#if 0 /* Add if you want validation error */
else {
clicon_err(OE_YANG, ENOENT, "No yang top found?");
goto done;
}
#endif
// ok:
retval = 0;
done:
return retval;