commit 852d93f09dcea9cb2396be3021c359598f3db6da
author aPiecek <piecek@cesnet.cz> Fri Nov 24 13:59:07 2023 +0100
committer Michal Vasko <mvasko@cesnet.cz> Mon Feb 26 13:20:21 2024 +0100
tree cbdc99b6e35cad53e99af6f1bcc9077164e5fb2d
parent 5c3c0caef1b855aa77640f2123d538b09b35e9ef

tree data REFACTOR lyd_free functions

The top parameter is removed.

src/tree_data_free.c

diff --git a/src/tree_data_free.c b/src/tree_data_free.c
index 40dd046..3927091 100644
--- a/src/tree_data_free.c
+++ b/src/tree_data_free.c
@@ -197,10 +197,9 @@
  * @brief Free Data (sub)tree.
  *
  * @param[in] node Data node to be freed.
- * @param[in] top Recursion flag to unlink the root of the subtree being freed.
  */
 static void
-lyd_free_subtree(struct lyd_node *node, ly_bool top)
+lyd_free_subtree(struct lyd_node *node)
 {
     struct lyd_node *iter, *next;
     struct lyd_node_opaq *opaq = NULL;
@@ -212,7 +211,7 @@
 
         /* free the children */
         LY_LIST_FOR_SAFE(lyd_child(node), next, iter) {
-            lyd_free_subtree(iter, 0);
+            lyd_free_subtree(iter);
         }
 
         lydict_remove(LYD_CTX(opaq), opaq->name.name);
@@ -227,7 +226,7 @@
 
         /* free the children */
         LY_LIST_FOR_SAFE(lyd_child(node), next, iter) {
-            lyd_free_subtree(iter, 0);
+            lyd_free_subtree(iter);
         }
     } else if (node->schema->nodetype & LYD_NODE_ANY) {
         /* only frees the value this way */
@@ -246,11 +245,6 @@
         lyd_free_meta_siblings(node->meta);
     }
 
-    /* unlink only the nodes from the first level, nodes in subtree are freed all, so no unlink is needed */
-    if (top) {
-        lyd_unlink(node);
-    }
-
     free(node);
 }
 
@@ -266,11 +260,12 @@
         return;
     }
 
-    lyd_free_subtree(node, 1);
+    lyd_unlink(node);
+    lyd_free_subtree(node);
 }
 
 static void
-lyd_free_(struct lyd_node *node, ly_bool top)
+lyd_free_(struct lyd_node *node)
 {
     struct lyd_node *iter, *next;
 
@@ -278,10 +273,7 @@
         return;
     }
 
-    /* get the first (top-level) sibling */
-    if (top) {
-        for ( ; node->parent; node = lyd_parent(node)) {}
-    }
+    /* get the first sibling */
     while (node->prev->next) {
         node = node->prev;
     }
@@ -293,18 +285,28 @@
         }
 
         /* in case of the top-level nodes (node->parent is NULL), no unlinking needed */
-        lyd_free_subtree(iter, iter->parent ? 1 : 0);
+        if (iter->parent) {
+            lyd_unlink(iter);
+        }
+        lyd_free_subtree(iter);
     }
 }
 
 LIBYANG_API_DEF void
 lyd_free_siblings(struct lyd_node *node)
 {
-    lyd_free_(node, 0);
+    lyd_free_(node);
 }
 
 LIBYANG_API_DEF void
 lyd_free_all(struct lyd_node *node)
 {
-    lyd_free_(node, 1);
+    if (!node) {
+        return;
+    }
+
+    /* get top-level node */
+    for ( ; node->parent; node = lyd_parent(node)) {}
+
+    lyd_free_(node);
 }