tree data UPDATE remove redundant lyd_new_list3_bin
diff --git a/src/tree_data.h b/src/tree_data.h
index 784b34f..9f918af 100644
--- a/src/tree_data.h
+++ b/src/tree_data.h
@@ -285,7 +285,6 @@
* - ::lyd_new_list()
* - ::lyd_new_list2()
* - ::lyd_new_list3()
- * - ::lyd_new_list3_bin()
* - ::lyd_new_any()
* - ::lyd_new_opaq()
* - ::lyd_new_opaq2()
@@ -1341,14 +1340,12 @@
/**
* @brief Create a new list node in the data tree.
*
- * To create a term node based on binary value, use ::lyd_new_list3_bin().
- *
* @param[in] parent Parent node for the node being created. NULL in case of creating a top level element.
* @param[in] module Module of the node being created. If NULL, @p parent module will be used.
* @param[in] name Schema node name of the new data node. The node must be #LYS_LIST.
* @param[in] key_values Ordered key string values of the new list instance, all must be set.
* @param[in] value_lengths Array of lengths of each @p key_values, may be NULL if @p key_values are 0-terminated strings.
- * @param[in] options Bitmask of options, see @ref newvalueoptions.
+ * @param[in] options Bitmask of options, see @ref newvaloptions.
* @param[out] node Optional created node.
* @return LY_ERR value.
*/
@@ -1356,21 +1353,6 @@
const char **key_values, uint32_t *value_lengths, uint32_t options, struct lyd_node **node);
/**
- * @brief Create a new list node in the data tree based on binary value.
- *
- * @param[in] parent Parent node for the node being created. NULL in case of creating a top level element.
- * @param[in] module Module of the node being created. If NULL, @p parent module will be used.
- * @param[in] name Schema node name of the new data node. The node must be #LYS_LIST.
- * @param[in] key_values Ordered key string values of the new list instance, all must be set.
- * @param[in] value_lengths Array of lengths of each @p key_values, may be NULL if @p key_values are 0-terminated strings.
- * @param[in] options Bitmask of options, see @ref newvalueoptions.
- * @param[out] node Optional created node.
- * @return LY_ERR value.
- */
-LIBYANG_API_DECL LY_ERR lyd_new_list3_bin(struct lyd_node *parent, const struct lys_module *module, const char *name,
- const void **key_values, uint32_t *value_lengths, uint32_t options, struct lyd_node **node);
-
-/**
* @brief Create a new term node in the data tree.
*
* To create a top-level term node defined in an extension instance, use ::lyd_new_ext_term().
diff --git a/src/tree_data_new.c b/src/tree_data_new.c
index 5c37712..ca712b5 100644
--- a/src/tree_data_new.c
+++ b/src/tree_data_new.c
@@ -766,20 +766,8 @@
return LY_SUCCESS;
}
-/**
- * @brief Create a new list node in the data tree.
- *
- * @param[in] parent Parent node for the node being created. NULL in case of creating a top level element.
- * @param[in] module Module of the node being created. If NULL, @p parent module will be used.
- * @param[in] name Schema node name of the new data node. The node must be #LYS_LIST.
- * @param[in] key_values Ordered key string values of the new list instance, all must be set.
- * @param[in] value_lengths Array of lengths of each @p key_values, may be NULL if @p key_values are 0-terminated strings.
- * @param[in] options Bitmask of options, see @ref newvalueoptions.
- * @param[out] node Optional created node.
- * @return LY_ERR value.
- */
-static LY_ERR
-_lyd_new_list3(struct lyd_node *parent, const struct lys_module *module, const char *name, const void **key_values,
+LIBYANG_API_DEF LY_ERR
+lyd_new_list3(struct lyd_node *parent, const struct lys_module *module, const char *name, const char **key_values,
uint32_t *value_lengths, uint32_t options, struct lyd_node **node)
{
struct lyd_node *ret = NULL, *key;
@@ -830,25 +818,6 @@
return rc;
}
-LIBYANG_API_DEF LY_ERR
-lyd_new_list3(struct lyd_node *parent, const struct lys_module *module, const char *name, const char **key_values,
- uint32_t *value_lengths, uint32_t options, struct lyd_node **node)
-{
- const struct ly_ctx *ctx = parent ? LYD_CTX(parent) : (module ? module->ctx : NULL);
-
- LY_CHECK_ARG_RET(ctx, !(options & LYD_NEW_VAL_BIN_VALUE), LY_EINVAL);
-
- return _lyd_new_list3(parent, module, name, (const void **)key_values, value_lengths, options, node);
-}
-
-LIBYANG_API_DECL LY_ERR
-lyd_new_list3_bin(struct lyd_node *parent, const struct lys_module *module, const char *name, const void **key_values,
- uint32_t *value_lengths, uint32_t options, struct lyd_node **node)
-{
- options |= LYD_NEW_VAL_BIN_VALUE;
- return _lyd_new_list3(parent, module, name, key_values, value_lengths, options, node);
-}
-
/**
* @brief Create a new term node in the data tree.
*
diff --git a/tests/utests/data/test_new.c b/tests/utests/data/test_new.c
index ea7945a..7194893 100644
--- a/tests/utests/data/test_new.c
+++ b/tests/utests/data/test_new.c
@@ -136,17 +136,13 @@
uint32_t val_lens[] = {1, 1};
- assert_int_equal(lyd_new_list3(NULL, mod, "l1", key_vals, val_lens, LYD_NEW_VAL_BIN_VALUE, &node), LY_EINVAL);
- CHECK_LOG_CTX("Invalid argument !(options & 0x04) (lyd_new_list3()).", NULL, 0);
- assert_int_equal(lyd_new_list3_bin(NULL, mod, "l1", (const void **)key_vals, val_lens, 0, &node), LY_SUCCESS);
+ assert_int_equal(lyd_new_list3(NULL, mod, "l1", key_vals, val_lens, LYD_NEW_VAL_BIN, &node), LY_SUCCESS);
lyd_free_tree(node);
- assert_int_equal(lyd_new_list3_bin(NULL, mod, "l1", (const void **)key_vals, val_lens, LYD_NEW_VAL_STORE_ONLY, &node), LY_EINVAL);
- CHECK_LOG_CTX("Invalid argument !(store_only && (format == LY_VALUE_CANON || format == LY_VALUE_LYB)) (_lyd_new_list3()).", NULL, 0);
assert_int_equal(lyd_new_list3(NULL, mod, "l1", key_vals, val_lens, LYD_NEW_VAL_CANON, &node), LY_SUCCESS);
lyd_free_tree(node);
assert_int_equal(lyd_new_list3(NULL, mod, "l1", key_vals, val_lens, LYD_NEW_VAL_CANON | LYD_NEW_VAL_STORE_ONLY, &node), LY_EINVAL);
- CHECK_LOG_CTX("Invalid argument !(store_only && (format == LY_VALUE_CANON || format == LY_VALUE_LYB)) (_lyd_new_list3()).", NULL, 0);
+ CHECK_LOG_CTX("Invalid argument !(store_only && (format == LY_VALUE_CANON || format == LY_VALUE_LYB)) (lyd_new_list3()).", NULL, 0);
assert_int_equal(lyd_new_list(NULL, mod, "l1", LYD_NEW_VAL_BIN, &node, "val_a", 5, "val_b", 5), LY_SUCCESS);
lyd_free_tree(node);