schema CHANGE resolve_schema_nodeid split into several functions
Also, lys_get_node() changed into ly_ctx_get_node().
diff --git a/src/tree_data.c b/src/tree_data.c
index c468853..b316506 100644
--- a/src/tree_data.c
+++ b/src/tree_data.c
@@ -1260,12 +1260,12 @@
for (i = 0; i < slist->unique_size; i++) {
for (j = 0; j < slist->unique[i].expr_size; j++) {
/* first */
- diter = resolve_data_nodeid(slist->unique[i].expr[j], first->child);
+ diter = resolve_data_descendant_schema_nodeid(slist->unique[i].expr[j], first->child);
if (diter) {
val1 = ((struct lyd_node_leaf_list *)diter)->value_str;
} else {
/* use default value */
- if (resolve_schema_nodeid(slist->unique[i].expr[j], first->schema->child, first->schema->module, LYS_LEAF, &snode)) {
+ if (resolve_descendant_schema_nodeid(slist->unique[i].expr[j], first->schema->child, LYS_LEAF, &snode)) {
/* error, but unique expression was checked when the schema was parsed */
return -1;
}
@@ -1273,12 +1273,12 @@
}
/* second */
- diter = resolve_data_nodeid(slist->unique[i].expr[j], second->child);
+ diter = resolve_data_descendant_schema_nodeid(slist->unique[i].expr[j], second->child);
if (diter) {
val2 = ((struct lyd_node_leaf_list *)diter)->value_str;
} else {
/* use default value */
- if (resolve_schema_nodeid(slist->unique[i].expr[j], second->schema->child, second->schema->module, LYS_LEAF, &snode)) {
+ if (resolve_descendant_schema_nodeid(slist->unique[i].expr[j], second->schema->child, LYS_LEAF, &snode)) {
/* error, but unique expression was checked when the schema was parsed */
return -1;
}
@@ -1480,7 +1480,7 @@
}
for (i = 0; i < slist->keys_size; ++i) {
- key = resolve_data_nodeid(slist->keys[i]->name, list->child);
+ key = resolve_data_descendant_schema_nodeid(slist->keys[i]->name, list->child);
if (key) {
ly_set_add(set, key);
}