commit 56daf7322717a49fb83acc136bb902a566b4d387
author Michal Vasko <mvasko@cesnet.cz> Mon Aug 10 10:57:18 2020 +0200
committer Michal Vasko <mvasko@cesnet.cz> Mon Aug 10 10:57:18 2020 +0200
tree b2500eb8591fc7656735f4eb7e46e59f810f861d
parent d43d71a22613af1c98e935cd6951afac5d095cc3

data tree REFACTOR data DFS should match schema DFS

src/tree_data.c

diff --git a/src/tree_data.c b/src/tree_data.c
index 69852d0..8bfaaa3 100644
--- a/src/tree_data.c
+++ b/src/tree_data.c
@@ -1439,7 +1439,7 @@
 API LY_ERR
 lyd_new_implicit_tree(struct lyd_node *tree, int implicit_options, struct lyd_node **diff)
 {
-    struct lyd_node *next, *node;
+    struct lyd_node *node;
     LY_ERR ret = LY_SUCCESS;
 
     LY_CHECK_ARG_RET(NULL, tree, LY_EINVAL);
@@ -1447,7 +1447,7 @@
         *diff = NULL;
     }
 
-    LYD_TREE_DFS_BEGIN(tree, next, node) {
+    LYD_TREE_DFS_BEGIN(tree, node) {
         /* skip added default nodes */
         if (((node->flags & (LYD_DEFAULT | LYD_NEW)) != (LYD_DEFAULT | LYD_NEW))
                 && (node->schema->nodetype & LYD_NODE_INNER)) {
@@ -1455,7 +1455,7 @@
                                                    NULL, implicit_options, diff), cleanup);
         }
 
-        LYD_TREE_DFS_END(tree, next, node);
+        LYD_TREE_DFS_END(tree, node);
     }
 
 cleanup:
@@ -2667,7 +2667,7 @@
 {
     LY_ERR ret;
     const struct lyd_node *child_src, *tmp, *sibling_src;
-    struct lyd_node *match_trg, *dup_src, *next, *elem;
+    struct lyd_node *match_trg, *dup_src, *elem;
     struct lysc_type *type;
 
     sibling_src = *sibling_src_p;
@@ -2720,9 +2720,9 @@
         }
 
         /* set LYD_NEW for all the new nodes, required for validation */
-        LYD_TREE_DFS_BEGIN(dup_src, next, elem) {
+        LYD_TREE_DFS_BEGIN(dup_src, elem) {
             elem->flags |= LYD_NEW;
-            LYD_TREE_DFS_END(dup_src, next, elem);
+            LYD_TREE_DFS_END(dup_src, elem);
         }
 
         lyd_insert_node(parent_trg, first_trg, dup_src);