[btr:] Rename btr_merge().

[paraslash.git] / buffer_tree.c

diff --git a/buffer_tree.c b/buffer_tree.c
index 7e0ec2786c193ae3718664a6436ea611d0eceb06..cd3a3c78a45db3babb73c34a3b860b55c2d99bd7 100644 (file)
--- a/buffer_tree.c
+++ b/buffer_tree.c
@@ -311,7 +311,7 @@ void *btr_context(struct btr_node *btrn)
  *
  * \return The number of buffers that have been available (zero, one or two).
  */
-int btr_merge(struct btr_node *btrn)
+static int merge_input(struct btr_node *btrn)
 {
        struct btr_buffer_reference *brs[2], *br;
        char *bufs[2], *buf;
@@ -352,14 +352,14 @@ int btr_merge(struct btr_node *btrn)
        return 2;
 }
 
-void btr_merge_to(struct btr_node *btrn, size_t dest_size)
+void btr_merge(struct btr_node *btrn, size_t dest_size)
 {
        for (;;) {
                char *buf;
                size_t len = btr_next_buffer(btrn, &buf);
                if (len >= dest_size)
                        return;
-               if (btr_merge(btrn) < 2)
+               if (merge_input(btrn) < 2)
                        return;
        }
 }