X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=buffer_tree.h;h=468b10d1d5a5c9ffaf815e14431baa56d6dcfe04;hp=27f5da2fb9d971c16279a981ef5525372e23f5f6;hb=dfecdabf4aa13e3587b7c73be0f051693dab4d20;hpb=e4713d70469e7ca1afd8e8b9a3e67c3764cf3933

diff --git a/buffer_tree.h b/buffer_tree.h
index 27f5da2f..468b10d1 100644
--- 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);
@@ -16,6 +16,7 @@ size_t btr_next_buffer(struct btr_node *btrn, char **bufp);
 void btr_consume(struct btr_node *btrn, size_t numbytes);
 int btr_exec(struct btr_node *btrn, const char *command, char **value_result);
 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_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);