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

yang access unctions

Browse source
This commit is contained in:
Olof hagsand 2019-04-25 13:50:02 +02:00
parent e9aa7bc98e
commit 161ef9c7b0
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/src/clixon_yang.c
View file

@ -845,17 +845,15 @@ yang_order(yang_stmt *y)
int i; int i;
int j=0; int j=0;
int tot = 0; int tot = 0;
if (y == NULL)
return -1;
/* Some special handling if yp is choice (or case) and maybe union? /* Some special handling if yp is choice (or case) and maybe union?
* if so, the real parent (from an xml point of view) is the parents * if so, the real parent (from an xml point of view) is the parents
* parent. * parent.
*/ */
if (y == NULL){ yp = yang_parent_get(y);
return -1; while (yang_keyword_get(yp) == Y_CASE || yang_keyword_get(yp) == Y_CHOICE)
}
yp = y->ys_parent;
while (yp->ys_keyword == Y_CASE || yp->ys_keyword == Y_CHOICE)
yp = yp->ys_parent; yp = yp->ys_parent;
/* XML nodes with yang specs that are children of modules are special - /* XML nodes with yang specs that are children of modules are special -
@ -864,8 +862,8 @@ yang_order(yang_stmt *y)
* Example: <x xmlns="foo"/><y xmlns="bar"/> * Example: <x xmlns="foo"/><y xmlns="bar"/>
* The order of x and y cannot be compared within a single yang module since they belong to different * The order of x and y cannot be compared within a single yang module since they belong to different
*/ */
if (yp->ys_keyword == Y_MODULE || yp->ys_keyword == Y_SUBMODULE){ if (yang_keyword_get(yp) == Y_MODULE || yang_keyword_get(yp) == Y_SUBMODULE){
ypp = yp->ys_parent; /* yang spec */ ypp = yang_parent_get(yp); /* yang spec */
for (i=0; i<ypp->ys_len; i++){ /* iterate through other modules */ for (i=0; i<ypp->ys_len; i++){ /* iterate through other modules */
ym = ypp->ys_stmt[i]; ym = ypp->ys_stmt[i];
if (yp == ym) if (yp == ym)