C-API changes: Replace yn_each with yn_iter, add keyw argument to yang_stats()
This commit is contained in:
parent
3e07a1d279
commit
4b9ee6740b
23 changed files with 358 additions and 248 deletions
|
|
@ -340,6 +340,7 @@ xml_nsctx_yang(yang_stmt *yn,
|
|||
char *prefix;
|
||||
char *mynamespace;
|
||||
char *myprefix;
|
||||
int inext;
|
||||
|
||||
if (yang_keyword_get(yn) == Y_SPEC){
|
||||
clixon_err(OE_YANG, EINVAL, "yang spec node is invalid argument");
|
||||
|
|
@ -371,8 +372,8 @@ xml_nsctx_yang(yang_stmt *yn,
|
|||
|
||||
/* Iterate over module and register all import prefixes
|
||||
*/
|
||||
y = NULL;
|
||||
while ((y = yn_each(ymod, y)) != NULL) {
|
||||
inext = 0;
|
||||
while ((y = yn_iter(ymod, &inext)) != NULL) {
|
||||
if (yang_keyword_get(y) == Y_IMPORT){
|
||||
if ((name = yang_argument_get(y)) == NULL)
|
||||
continue; /* Just skip - shouldnt happen) */
|
||||
|
|
@ -424,6 +425,7 @@ xml_nsctx_yangspec(yang_stmt *yspec,
|
|||
yang_stmt *ymod = NULL;
|
||||
yang_stmt *yprefix;
|
||||
yang_stmt *ynamespace;
|
||||
int inext;
|
||||
|
||||
if (ncp && *ncp)
|
||||
nc = *ncp;
|
||||
|
|
@ -431,8 +433,8 @@ xml_nsctx_yangspec(yang_stmt *yspec,
|
|||
clixon_err(OE_XML, errno, "cvec_new");
|
||||
goto done;
|
||||
}
|
||||
ymod = NULL;
|
||||
while ((ymod = yn_each(yspec, ymod)) != NULL){
|
||||
inext = 0;
|
||||
while ((ymod = yn_iter(yspec, &inext)) != NULL){
|
||||
if (yang_keyword_get(ymod) != Y_MODULE)
|
||||
continue;
|
||||
if ((yprefix = yang_find(ymod, Y_PREFIX, NULL)) == NULL)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue