[btr]: Add btr_merge_to().

diff --git a/buffer_tree.c b/buffer_tree.c
index 1cb295b4de02e3ca3003f83043cf34d536f2ffc5..2c02c69466f19111241aa835dd2f919cf710ecc0 100644 (file)
--- a/buffer_tree.c
+++ b/buffer_tree.c
@@ -309,7 +309,7 @@ void *btr_context(struct btr_node *btrn)
  *
  * This is a quite expensive operation.
  *
- * \return The number of buffers that have been merged (zero, one or two).
+ * \return The number of buffers that have been available (zero, one or two).
  */
 int btr_merge(struct btr_node *btrn)
 {
@@ -351,3 +351,15 @@ int btr_merge(struct btr_node *btrn)
        para_list_add(&br->node, &btrn->input_queue);
        return 2;
 }
+
+void btr_merge_to(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)
+                       return;
+       }
+}

diff --git a/buffer_tree.h b/buffer_tree.h
index 468b10d1d5a5c9ffaf815e14431baa56d6dcfe04..4d3502d52ffd0e3493fbe7c9afa746c3a603d61b 100644 (file)
--- a/buffer_tree.h
+++ b/buffer_tree.h
@@ -20,3 +20,4 @@ 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);