X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=buffer_tree.c;h=84dc933a037c7552db6fdd7559ea096c2f892ae1;hp=fd0a59cad58c0027e3911b08eb5f0bd20a176ed5;hb=072391fccbd052334dbd836d451f2be0a74a0685;hpb=79d6515d49cdb0a91ff7c4a599f2d63cb5678032

diff --git a/buffer_tree.c b/buffer_tree.c
index fd0a59ca..84dc933a 100644
--- a/buffer_tree.c
+++ b/buffer_tree.c
@@ -544,14 +544,16 @@ static bool btr_no_children(struct btr_node *btrn)
 }
 
 /**
- * Find out whether a node is an orphan node.
+ * Find out whether a node is an orphan.
  *
  * \param btrn The buffer tree node.
  *
  * \return True if \a btrn has no parent.
  *
- * This function will always return true for the root node.  However in case
- * nodes have been removed from the tree, other nodes may become orphans too.
+ * This function returns true for the root node and false for any other node.
+ *
+ * After a (non-leaf) node was removed removed from the tree, the function
+ * returns true for all child nodes.
  */
 bool btr_no_parent(struct btr_node *btrn)
 {
@@ -833,7 +835,7 @@ size_t btr_get_input_queue_size(struct btr_node *btrn)
 /**
  * Remove a node from the buffer tree, reconnecting parent and children.
  *
- * \param btrn The node to splice out.
+ * \param btrnp The node to splice out.
  *
  * This function is used by buffer tree nodes that do not exist during the
  * whole lifetime of the buffer tree. Unlike btr_remove_node(), calling
@@ -841,9 +843,9 @@ size_t btr_get_input_queue_size(struct btr_node *btrn)
  * but reconnects the buffer tree by making all child nodes of \a btrn children
  * of the parent of \a btrn.
  */
-void btr_splice_out_node(struct btr_node *btrn)
+void btr_splice_out_node(struct btr_node **btrnp)
 {
-	struct btr_node *ch, *tmp;
+	struct btr_node *btrn = *btrnp, *ch, *tmp;
 
 	assert(btrn);
 	PARA_NOTICE_LOG("splicing out %s\n", btrn->name);
@@ -856,9 +858,11 @@ void btr_splice_out_node(struct btr_node *btrn)
 		ch->parent = btrn->parent;
 		if (btrn->parent)
 			list_move(&ch->node, &btrn->parent->children);
+		else
+			list_del(&ch->node);
 	}
 	assert(list_empty(&btrn->children));
-	btrn->parent = NULL;
+	*btrnp = NULL;
 }
 
 /**