buffer tree: Fix btr_splice_out_node().

[paraslash.git] / buffer_tree.h

diff --git a/buffer_tree.h b/buffer_tree.h
index 27f5da2fb9d971c16279a981ef5525372e23f5f6..927d3b6731197bc02260ece8e0cfdea9406d7544 100644 (file)
--- a/buffer_tree.h
+++ b/buffer_tree.h
@@ -4,7 +4,7 @@ struct btr_node;
 typedef int (*btr_command_handler)(struct btr_node *btrn,
                const char *command, char **result);
 
-struct btr_node *btr_new_node(char *name, struct btr_node *parent,
+struct btr_node *btr_new_node(const char *name, struct btr_node *parent,
                btr_command_handler handler, void *context);
 void btr_del_node(struct btr_node *btrn);
 void btr_add_output(char *buf, size_t size, struct btr_node *btrn);
@@ -19,3 +19,4 @@ int btr_exec_up(struct btr_node *btrn, const char *command, char **value_result)
 int btr_splice_out_node(struct btr_node *btrn);
 void btr_pushdown(struct btr_node *btrn);
 void *btr_context(struct btr_node *btrn);
+int btr_merge(struct btr_node *btrn);