xpath CHANGE make functions return LY_ERR values
some of the functions were mixing return value of -1 for error with
positive numbers for index in some set/array. Instead, make them return
LY_ERR value to clearly state the error type and return index via an
optional output parameter. This also avoids limiting unsigned index type
by the signed int type returned so far.
diff --git a/src/tree_schema_compile.c b/src/tree_schema_compile.c
index 8ebf744..b302f39 100644
--- a/src/tree_schema_compile.c
+++ b/src/tree_schema_compile.c
@@ -6810,8 +6810,8 @@
/* skip roots'n'stuff */
if (tmp_set.val.scnodes[j].type == LYXP_NODE_ELEM) {
/* try to find this node in our set */
- int idx = lyxp_set_scnode_dup_node_check(set, tmp_set.val.scnodes[j].scnode, LYXP_NODE_ELEM, -1);
- if ((idx > -1) && (set->val.scnodes[idx].in_ctx == -1)) {
+ uint32_t idx;
+ if (lyxp_set_scnode_contains(set, tmp_set.val.scnodes[j].scnode, LYXP_NODE_ELEM, -1, &idx) && (set->val.scnodes[idx].in_ctx == -1)) {
LOGVAL(set->ctx, LY_VLOG_LYSC, node, LY_VCODE_CIRC_WHEN, node->name, set->val.scnodes[idx].scnode->name);
ret = LY_EVALID;
goto cleanup;
diff --git a/src/xpath.c b/src/xpath.c
index 9b9e835..8f96c45 100644
--- a/src/xpath.c
+++ b/src/xpath.c
@@ -777,9 +777,11 @@
for (i = 0; i < set->used; ++i) {
if ((set->val.scnodes[i].in_ctx == 1) || (set->val.scnodes[i].in_ctx == -2)) {
- int idx = lyxp_set_scnode_insert_node(ret, set->val.scnodes[i].scnode, set->val.scnodes[i].type);
+ uint32_t idx;
+ LY_CHECK_ERR_RET(lyxp_set_scnode_insert_node(ret, set->val.scnodes[i].scnode, set->val.scnodes[i].type, &idx),
+ lyxp_set_free(ret), NULL);
/* coverity seems to think scnodes can be NULL */
- if ((idx == -1) || !ret->val.scnodes) {
+ if (!ret->val.scnodes) {
lyxp_set_free(ret);
return NULL;
}
@@ -1052,8 +1054,9 @@
return LY_SUCCESS;
}
-int
-lyxp_set_scnode_dup_node_check(struct lyxp_set *set, const struct lysc_node *node, enum lyxp_node_type node_type, int skip_idx)
+uint8_t
+lyxp_set_scnode_contains(struct lyxp_set *set, const struct lysc_node *node, enum lyxp_node_type node_type, int skip_idx,
+ uint32_t *index_p)
{
uint32_t i;
@@ -1063,11 +1066,14 @@
}
if ((set->val.scnodes[i].scnode == node) && (set->val.scnodes[i].type == node_type)) {
- return i;
+ if (index_p) {
+ *index_p = i;
+ }
+ return 1;
}
}
- return -1;
+ return 0;
}
void
@@ -1173,31 +1179,34 @@
}
}
-int
-lyxp_set_scnode_insert_node(struct lyxp_set *set, const struct lysc_node *node, enum lyxp_node_type node_type)
+LY_ERR
+lyxp_set_scnode_insert_node(struct lyxp_set *set, const struct lysc_node *node, enum lyxp_node_type node_type, uint32_t *index_p)
{
- int ret;
+ uint32_t index;
assert(set->type == LYXP_SET_SCNODE_SET);
- ret = lyxp_set_scnode_dup_node_check(set, node, node_type, -1);
- if (ret > -1) {
- set->val.scnodes[ret].in_ctx = 1;
+ if (lyxp_set_scnode_contains(set, node, node_type, -1, &index)) {
+ set->val.scnodes[index].in_ctx = 1;
} else {
if (set->used == set->size) {
set->val.scnodes = ly_realloc(set->val.scnodes, (set->size + LYXP_SET_SIZE_STEP) * sizeof *set->val.scnodes);
- LY_CHECK_ERR_RET(!set->val.scnodes, LOGMEM(set->ctx), -1);
+ LY_CHECK_ERR_RET(!set->val.scnodes, LOGMEM(set->ctx), LY_EMEM);
set->size += LYXP_SET_SIZE_STEP;
}
- ret = set->used;
- set->val.scnodes[ret].scnode = (struct lysc_node *)node;
- set->val.scnodes[ret].type = node_type;
- set->val.scnodes[ret].in_ctx = 1;
+ index = set->used;
+ set->val.scnodes[index].scnode = (struct lysc_node *)node;
+ set->val.scnodes[index].type = node_type;
+ set->val.scnodes[index].in_ctx = 1;
++set->used;
}
- return ret;
+ if (index_p) {
+ *index_p = index;
+ }
+
+ return LY_SUCCESS;
}
/**
@@ -3619,7 +3628,7 @@
if (options & LYXP_SCNODE_ALL) {
set_scnode_clear_ctx(set);
- lyxp_set_scnode_insert_node(set, set->ctx_scnode, LYXP_NODE_ELEM);
+ LY_CHECK_RET(lyxp_set_scnode_insert_node(set, set->ctx_scnode, LYXP_NODE_ELEM, NULL));
} else {
lyxp_set_free_content(set);
@@ -3676,7 +3685,7 @@
target = p[LY_ARRAY_COUNT(p) - 1].node;
ly_path_free(set->ctx, p);
- lyxp_set_scnode_insert_node(set, target, LYXP_NODE_ELEM);
+ LY_CHECK_RET(lyxp_set_scnode_insert_node(set, target, LYXP_NODE_ELEM, NULL));
}
return rc;
@@ -5291,7 +5300,7 @@
if (options & LYXP_SCNODE_ALL) {
set_scnode_clear_ctx(set);
- lyxp_set_scnode_insert_node(set, NULL, set->root_type);
+ lyxp_set_scnode_insert_node(set, NULL, set->root_type, NULL);
} else {
set->type = LYXP_SET_NODE_SET;
set->used = 0;
@@ -5561,7 +5570,6 @@
static LY_ERR
moveto_scnode(struct lyxp_set *set, const struct lys_module *mod, const char *ncname, uint32_t options)
{
- int idx;
uint8_t temp_ctx = 0;
uint32_t getnext_opts;
uint32_t orig_used, i;
@@ -5585,6 +5593,8 @@
orig_used = set->used;
for (i = 0; i < orig_used; ++i) {
+ uint32_t idx;
+
if (set->val.scnodes[i].in_ctx != 1) {
if (set->val.scnodes[i].in_ctx != -2) {
continue;
@@ -5607,10 +5617,10 @@
/* module may not be implemented */
while (mod->implemented && (iter = lys_getnext(iter, NULL, mod->compiled, getnext_opts))) {
if (!moveto_scnode_check(iter, set->root_type, set->context_op, ncname, mod)) {
- idx = lyxp_set_scnode_insert_node(set, iter, LYXP_NODE_ELEM);
- LY_CHECK_RET(idx < 0, LY_EMEM);
+ LY_CHECK_RET(lyxp_set_scnode_insert_node(set, iter, LYXP_NODE_ELEM, &idx));
+
/* we need to prevent these nodes from being considered in this moveto */
- if (((uint32_t)idx < orig_used) && ((uint32_t)idx > i)) {
+ if ((idx < orig_used) && (idx > i)) {
set->val.scnodes[idx].in_ctx = 2;
temp_ctx = 1;
}
@@ -5629,9 +5639,9 @@
iter = NULL;
while ((iter = lys_getnext(iter, start_parent, NULL, getnext_opts))) {
if (!moveto_scnode_check(iter, set->root_type, set->context_op, ncname, (mod ? mod : set->local_mod))) {
- idx = lyxp_set_scnode_insert_node(set, iter, LYXP_NODE_ELEM);
- LY_CHECK_RET(idx < 0, LY_EMEM);
- if (((uint32_t)idx < orig_used) && ((uint32_t)idx > i)) {
+ LY_CHECK_RET(lyxp_set_scnode_insert_node(set, iter, LYXP_NODE_ELEM, &idx));
+
+ if ((idx < orig_used) && (idx > i)) {
set->val.scnodes[idx].in_ctx = 2;
temp_ctx = 1;
}
@@ -5751,7 +5761,6 @@
moveto_scnode_alldesc(struct lyxp_set *set, const struct lys_module *mod, const char *ncname, uint32_t options)
{
uint32_t i, orig_used;
- int idx;
const struct lysc_node *next, *elem, *start;
LY_ERR rc;
@@ -5787,14 +5796,16 @@
rc = moveto_scnode_check(elem, set->root_type, set->context_op, ncname, mod);
if (!rc) {
- if ((idx = lyxp_set_scnode_dup_node_check(set, elem, LYXP_NODE_ELEM, i)) > -1) {
+ uint32_t idx;
+
+ if (lyxp_set_scnode_contains(set, elem, LYXP_NODE_ELEM, i, &idx)) {
set->val.scnodes[idx].in_ctx = 1;
if ((uint32_t)idx > i) {
/* we will process it later in the set */
goto skip_children;
}
} else {
- lyxp_set_scnode_insert_node(set, elem, LYXP_NODE_ELEM);
+ LY_CHECK_RET(lyxp_set_scnode_insert_node(set, elem, LYXP_NODE_ELEM, NULL));
}
} else if (rc == LY_EINVAL) {
goto skip_children;
@@ -6201,7 +6212,7 @@
continue;
}
- lyxp_set_scnode_insert_node(set, iter, LYXP_NODE_ELEM);
+ LY_CHECK_RET(lyxp_set_scnode_insert_node(set, iter, LYXP_NODE_ELEM, NULL));
/* throw away the insert index, we want to consider that node again, recursively */
}
}
@@ -6214,7 +6225,7 @@
continue;
}
- lyxp_set_scnode_insert_node(set, iter, LYXP_NODE_ELEM);
+ LY_CHECK_RET(lyxp_set_scnode_insert_node(set, iter, LYXP_NODE_ELEM, NULL));
}
}
}
@@ -6310,8 +6321,7 @@
static LY_ERR
moveto_scnode_parent(struct lyxp_set *set, uint8_t all_desc, uint32_t options)
{
- int idx;
- uint32_t i, orig_used;
+ uint32_t i, orig_used, idx;
uint8_t temp_ctx = 0;
const struct lysc_node *node, *new_node;
enum lyxp_node_type new_type;
@@ -6361,9 +6371,8 @@
new_type = LYXP_NODE_ELEM;
}
- idx = lyxp_set_scnode_insert_node(set, new_node, new_type);
- LY_CHECK_RET(idx < 0, LY_EMEM);
- if (((uint32_t)idx < orig_used) && ((uint32_t)idx > i)) {
+ LY_CHECK_RET(lyxp_set_scnode_insert_node(set, new_node, new_type, &idx));
+ if ((idx < orig_used) && (idx > i)) {
set->val.scnodes[idx].in_ctx = 2;
temp_ctx = 1;
}
@@ -8593,7 +8602,7 @@
tok_idx = 0;
memset(set, 0, sizeof *set);
set->type = LYXP_SET_SCNODE_SET;
- lyxp_set_scnode_insert_node(set, real_ctx_scnode, ctx_scnode_type);
+ LY_CHECK_RET(lyxp_set_scnode_insert_node(set, real_ctx_scnode, ctx_scnode_type, NULL));
set->val.scnodes[0].in_ctx = -2;
set->ctx = ctx;
set->ctx_scnode = ctx_scnode;
diff --git a/src/xpath.h b/src/xpath.h
index a0d7c4a..2d35dde 100644
--- a/src/xpath.h
+++ b/src/xpath.h
@@ -340,9 +340,11 @@
* @param[in] set Set to insert into.
* @param[in] node Node to insert.
* @param[in] node_type Node type of @p node.
- * @return Index of the inserted node in set.
+ * @param[out] index_p Optional pointer to store index if the inserted @p node.
+ * @return LY_SUCCESS on success.
+ * @return LY_EMEM on memory allocation failure.
*/
-int lyxp_set_scnode_insert_node(struct lyxp_set *set, const struct lysc_node *node, enum lyxp_node_type node_type);
+LY_ERR lyxp_set_scnode_insert_node(struct lyxp_set *set, const struct lysc_node *node, enum lyxp_node_type node_type, uint32_t *index_p);
/**
* @brief Check for duplicates in a schema node set.
@@ -351,10 +353,12 @@
* @param[in] node Node to look for in @p set.
* @param[in] node_type Type of @p node.
* @param[in] skip_idx Index from @p set to skip.
- * @return Index of the found node, -1 if not found.
+ * @param[out] index_p Optional pointer to store index if the node is found.
+ * @return 0 if not found
+ * @return 1 if the @p node found.
*/
-int lyxp_set_scnode_dup_node_check(struct lyxp_set *set, const struct lysc_node *node, enum lyxp_node_type node_type,
- int skip_idx);
+uint8_t lyxp_set_scnode_contains(struct lyxp_set *set, const struct lysc_node *node, enum lyxp_node_type node_type,
+ int skip_idx, uint32_t *index_p);
/**
* @brief Merge 2 schema node sets.