[btr:] Rename btr_merge().

[paraslash.git] / buffer_tree.h

diff --git a/buffer_tree.h b/buffer_tree.h
index 4d3502d52ffd0e3493fbe7c9afa746c3a603d61b..589bde2779d5baeb43b15fbfaeeca952ac59b018 100644 (file)
--- a/buffer_tree.h
+++ b/buffer_tree.h
@@ -19,5 +19,5 @@ int btr_exec_up(struct btr_node *btrn, const char *command, char **value_result)
 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);
-void btr_merge_to(struct btr_node *btrn, size_t dest_size);
+void btr_merge(struct btr_node *btrn, size_t dest_size);
+bool btr_eof(struct btr_node *btrn);