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

Changed singnature of ys_real_module and improved error handling

Browse source
This commit is contained in:
Olof hagsand 2020-08-27 11:01:09 +02:00
parent 1a2e074539
commit 576533ed82
7 changed files with 52 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/src/clixon_path.c
View file

@ -298,11 +298,12 @@ yang2api_path_fmt_1(yang_stmt *ys,
cbuf *cb)
{
yang_stmt *yp; /* parent */
yang_stmt *ymod;
yang_stmt *ymod = NULL;
yang_stmt *ypmod = NULL;
int i;
cvec *cvk = NULL; /* vector of index keys */
int retval = -1;
if ((yp = yang_parent_get(ys)) == NULL){
clicon_err(OE_YANG, EINVAL, "yang expected parent %s", yang_argument_get(ys));
goto done;
@ -329,7 +330,11 @@ yang2api_path_fmt_1(yang_stmt *ys,
cprintf(cb, "/");
}
/* If parent namespace/module is different from child -> add child prefix */
if (ys_real_module(yp) != (ymod = ys_real_module(ys)))
if (ys_real_module(yp, &ypmod) < 0)
goto done;
if (ys_real_module(ys, &ymod) < 0)
goto done;
if (ypmod != ymod)
cprintf(cb, "%s:", yang_argument_get(ymod));
}
else /* top symbol - mark with name prefix */