Skip to content

Commit 4eeeaae

Browse files
committed
tree data UPDATE remove redundant function
1 parent ca25b01 commit 4eeeaae

File tree

2 files changed

+0
-53
lines changed

2 files changed

+0
-53
lines changed

src/diff.c

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1949,41 +1949,6 @@ lyd_diff_apply_all(struct lyd_node **data, const struct lyd_node *diff)
19491949
return lyd_diff_apply_module(data, diff, NULL, NULL, NULL);
19501950
}
19511951

1952-
LIBYANG_API_DEF LY_ERR
1953-
lyd_diff_apply_node(struct lyd_node *data_parent, struct lyd_node **data_first, const struct lyd_node *diff_node)
1954-
{
1955-
LY_ERR ret = LY_SUCCESS;
1956-
struct ly_ht *dup_inst = NULL;
1957-
1958-
LY_CHECK_ARG_RET(NULL, data_parent || data_first, diff_node, LY_EINVAL);
1959-
1960-
/* diff_node is top level node, data_parent must be NULL */
1961-
if (!diff_node->parent && data_parent) {
1962-
LOGERR(LYD_CTX(diff_node), LY_EINVAL, "data_parent must be NULL when applying top-level diff_node.");
1963-
return LY_EINVAL;
1964-
}
1965-
1966-
if (!data_first) {
1967-
data_first = lyd_node_child_p(data_parent);
1968-
}
1969-
1970-
/* diff_node is top level node, data_first must be set */
1971-
if (!diff_node->parent && !data_first) {
1972-
LOGERR(LYD_CTX(diff_node), LY_EINVAL, "data_first is not set, when working with top-level node.");
1973-
return LY_EINVAL;
1974-
}
1975-
1976-
if (diff_node->parent && data_parent && (diff_node->parent->schema != data_parent->schema)) {
1977-
LOGERR(LYD_CTX(diff_node), LY_EINVAL, "Schemas of data_parent and diff_node do not match.");
1978-
return LY_EINVAL;
1979-
}
1980-
1981-
ret = lyd_diff_apply_r(data_first, data_parent, diff_node, NULL, NULL, &dup_inst);
1982-
1983-
lyd_dup_inst_free(dup_inst);
1984-
return ret;
1985-
}
1986-
19871952
/**
19881953
* @brief Update operations on a diff node when the new operation is NONE.
19891954
*

src/tree_data.h

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2186,24 +2186,6 @@ LIBYANG_API_DECL LY_ERR lyd_diff_apply_module(struct lyd_node **data, const stru
21862186
*/
21872187
LIBYANG_API_DECL LY_ERR lyd_diff_apply_all(struct lyd_node **data, const struct lyd_node *diff);
21882188

2189-
/**
2190-
* @brief Apply the diff subtree on a data tree.
2191-
*
2192-
* Details are mentioned in ::lyd_diff_apply_module().
2193-
*
2194-
* @param[in,out] data_parent Parent of data to apply the diff subtree on.
2195-
* If @p diff_node is a top-level node, this parameter must be NULL.
2196-
* If @p diff_node has a parent, its schema must match this parameter schema.
2197-
* @param[in,out] data_first First sibling of the subtree.
2198-
* If @p diff_node is a top-level node, this parameter must point to the first top-level sibling.
2199-
* Optional for nested data.
2200-
* @param[in] diff_node Diff subtree to apply on data.
2201-
* @return LY_SUCCESS on success,
2202-
* @return LY_ERR on error.
2203-
*/
2204-
LIBYANG_API_DECL LY_ERR lyd_diff_apply_node(struct lyd_node *data_parent, struct lyd_node **data_first,
2205-
const struct lyd_node *diff_node);
2206-
22072189
/**
22082190
* @ingroup datatree
22092191
* @defgroup diffmergeoptions Data diff merge options.

0 commit comments

Comments
 (0)