Corrected "No yang spec" printed on tty on leafref CLI usage

This commit is contained in:
Olof hagsand 2018-01-06 13:40:14 +01:00
parent 071667102c
commit 83cb696d0e
5 changed files with 22 additions and 15 deletions

View file

@ -549,10 +549,8 @@ yang_find_myprefix(yang_stmt *ys)
clicon_err(OE_YANG, 0, "My yang module not found");
goto done;
}
if ((yprefix = yang_find((yang_node*)ymod, Y_PREFIX, NULL)) == NULL){
clicon_err(OE_YANG, 0, "No prefix in my module");
if ((yprefix = yang_find((yang_node*)ymod, Y_PREFIX, NULL)) == NULL)
goto done;
}
prefix = yprefix->ys_argument;
done:
return prefix;
@ -729,7 +727,6 @@ yang_find_module_by_prefix(yang_stmt *ys,
clicon_err(OE_YANG, 0, "My yang spec not found");
goto done;
}
myprefix = yang_find_myprefix(ys);
if ((my_ymod = ys_module(ys)) == NULL){
clicon_err(OE_YANG, 0, "My yang module not found");
goto done;
@ -741,7 +738,8 @@ yang_find_module_by_prefix(yang_stmt *ys,
goto done;
}
#endif
if (strcmp(myprefix, prefix) == 0){
myprefix = yang_find_myprefix(ys);
if (myprefix && strcmp(myprefix, prefix) == 0){
ymod = my_ymod;
goto done;
}