From 394c0c44021acbfc07a64875d3306c8a287e3d69 Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Sun, 27 Sep 2015 11:58:54 -0300 Subject: rbuffer: Enhance rbuffer_reset to work with filled RBuffers --- src/nvim/rbuffer.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'src/nvim/rbuffer.c') diff --git a/src/nvim/rbuffer.c b/src/nvim/rbuffer.c index 0a04ba1954..b3805a3a28 100644 --- a/src/nvim/rbuffer.c +++ b/src/nvim/rbuffer.c @@ -24,11 +24,13 @@ RBuffer *rbuffer_new(size_t capacity) rv->size = 0; rv->write_ptr = rv->read_ptr = rv->start_ptr; rv->end_ptr = rv->start_ptr + capacity; + rv->temp = NULL; return rv; } void rbuffer_free(RBuffer *buf) { + xfree(buf->temp); xfree(buf); } @@ -69,12 +71,20 @@ char *rbuffer_write_ptr(RBuffer *buf, size_t *write_count) FUNC_ATTR_NONNULL_ALL return buf->write_ptr; } -// Set read and write pointer for an empty RBuffer to the beginning of the -// buffer. +// Reset an RBuffer so read_ptr is at the beginning of the memory. If +// necessary, this moves existing data by allocating temporary memory. void rbuffer_reset(RBuffer *buf) FUNC_ATTR_NONNULL_ALL { - if (buf->size == 0) { - buf->write_ptr = buf->read_ptr = buf->start_ptr; + size_t temp_size; + if ((temp_size = rbuffer_size(buf))) { + if (buf->temp == NULL) { + buf->temp = xmalloc(rbuffer_capacity(buf)); + } + rbuffer_read(buf, buf->temp, buf->size); + } + buf->read_ptr = buf->write_ptr = buf->start_ptr; + if (temp_size) { + rbuffer_write(buf, buf->temp, temp_size); } } -- cgit