Cleanup register implementation

1 files changed, 12 insertions, 8 deletions

diff --git a/register.c b/register.c
index b1a4453..30ad19c 100644
--- a/register.c
+++ b/register.c
@@ -7,22 +7,26 @@
 #include "util.h"
 
 void register_release(Register *reg) {
-	buffer_release((Buffer*)reg);
+	buffer_release(&reg->buf);
+}
+
+const char *register_get(Register *reg, size_t *len) {
+	*len = reg->buf.len;
+	return reg->buf.data;
 }
 
 bool register_put(Register *reg, Text *txt, Filerange *range) {
-	size_t len = range->end - range->start;
-	if (!buffer_grow((Buffer*)reg, len))
+	size_t len = text_range_size(range);
+	if (!buffer_grow(&reg->buf, len))
 		return false;
-	reg->len = text_bytes_get(txt, range->start, len, reg->data);
+	reg->buf.len = text_bytes_get(txt, range->start, len, reg->buf.data);
 	return true;
 }
 
 bool register_append(Register *reg, Text *txt, Filerange *range) {
-	size_t rem = reg->size - reg->len;
-	size_t len = range->end - range->start;
-	if (len > rem && !buffer_grow((Buffer*)reg, reg->size + len - rem))
+	size_t len = text_range_size(range);
+	if (!buffer_grow(&reg->buf, reg->buf.len + len))
 		return false;
-	reg->len += text_bytes_get(txt, range->start, len, reg->data + reg->len);
+	reg->buf.len += text_bytes_get(txt, range->start, len, reg->buf.data + reg->buf.len);
 	return true;
 }