merge from develop

This commit is contained in:
Olof hagsand 2017-08-01 20:07:51 +02:00
commit ed1c1e1495
2 changed files with 3 additions and 3 deletions

View file

@ -219,7 +219,7 @@ netconf_plugin_callbacks(clicon_handle h,
yang_stmt *yinput; yang_stmt *yinput;
yang_stmt *youtput; yang_stmt *youtput;
cxobj *xoutput; cxobj *xoutput;
cbuf *cb; cbuf *cb = NULL;
if (deps != NULL){ if (deps != NULL){
nreg = deps; nreg = deps;

View file

@ -1741,7 +1741,7 @@ schema_nodeid_vec(yang_node *yn,
int retval = -1; int retval = -1;
char *arg; char *arg;
yang_node *ynext; yang_node *ynext;
char *nodeid; char *nodeid = NULL;
int i; int i;
yang_stmt *ys; yang_stmt *ys;
int match; int match;
@ -1788,7 +1788,7 @@ schema_nodeid_vec(yang_node *yn,
if (yang_schemanode((yang_stmt*)ynext)) if (yang_schemanode((yang_stmt*)ynext))
*yres = (yang_stmt*)ynext; *yres = (yang_stmt*)ynext;
else else
clicon_debug(1, "%s not schema node", nodeid); clicon_debug(1, "%s not schema node", arg);
goto ok; goto ok;
} }
/* recursive call using ynext */ /* recursive call using ynext */