X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=buffer_tree.c;h=b0cd6665416627806d922cda50fac2e2eeeab17f;hp=5afa3ad3deda281415cfd172af0c13092b95ad67;hb=06d0c50525fc14e8127916481a74c14a2f7098af;hpb=72e9bdf7c5c09ca4c20cad56c68a9a155cceff43

diff --git a/buffer_tree.c b/buffer_tree.c
index 5afa3ad3..b0cd6665 100644
--- a/buffer_tree.c
+++ b/buffer_tree.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2014 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -771,6 +771,12 @@ void btr_drain(struct btr_node *btrn)
 		btr_drop_buffer_reference(br);
 }
 
+static void btr_free_node(struct btr_node *btrn)
+{
+	free(btrn->name);
+	free(btrn);
+}
+
 /**
  * Remove a node from a buffer tree.
  *
@@ -798,8 +804,7 @@ void btr_remove_node(struct btr_node **btrnp)
 	btr_drain(btrn);
 	if (btrn->parent)
 		list_del(&btrn->node);
-	free(btrn->name);
-	free(btrn);
+	btr_free_node(btrn);
 out:
 	*btrnp = NULL;
 }
@@ -862,6 +867,7 @@ void btr_splice_out_node(struct btr_node **btrnp)
 			list_del(&ch->node);
 	}
 	assert(list_empty(&btrn->children));
+	btr_free_node(btrn);
 	*btrnp = NULL;
 }