aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc André Tanner <mat@brain-dump.org>2017-02-20 13:22:15 +0100
committerMarc André Tanner <mat@brain-dump.org>2017-02-20 13:22:15 +0100
commit99e17811ecb0ee355a8d5aaeab28276892060e1c (patch)
treeea08e8f9da10ae2fc3604050a6da85fffdd35d9a
parent6ed81bd011d4fba6eaea7c5d4b3b037dc3022c3c (diff)
downloadvis-99e17811ecb0ee355a8d5aaeab28276892060e1c.tar.gz
vis-99e17811ecb0ee355a8d5aaeab28276892060e1c.tar.xz
buffer: rename buffer_grow to buffer_reserve
-rw-r--r--buffer.c8
-rw-r--r--buffer.h2
-rw-r--r--register.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/buffer.c b/buffer.c
index 3bc89d2..ca63265 100644
--- a/buffer.c
+++ b/buffer.c
@@ -14,7 +14,7 @@ void buffer_init(Buffer *buf) {
memset(buf, 0, sizeof *buf);
}
-bool buffer_grow(Buffer *buf, size_t size) {
+bool buffer_reserve(Buffer *buf, size_t size) {
/* ensure minimal buffer size, to avoid repeated realloc(3) calls */
if (size < BUFFER_SIZE)
size = BUFFER_SIZE;
@@ -46,7 +46,7 @@ void buffer_clear(Buffer *buf) {
}
bool buffer_put(Buffer *buf, const void *data, size_t len) {
- if (!buffer_grow(buf, len))
+ if (!buffer_reserve(buf, len))
return false;
memmove(buf->data, data, len);
buf->len = len;
@@ -72,7 +72,7 @@ bool buffer_insert(Buffer *buf, size_t pos, const void *data, size_t len) {
return false;
if (len == 0)
return true;
- if (!buffer_grow(buf, buf->len + len))
+ if (!buffer_reserve(buf, buf->len + len))
return false;
size_t move = buf->len - pos;
if (move > 0)
@@ -115,7 +115,7 @@ static bool buffer_vappendf(Buffer *buf, const char *fmt, va_list ap) {
va_list ap_save;
va_copy(ap_save, ap);
int len = vsnprintf(NULL, 0, fmt, ap);
- if (len == -1 || !buffer_grow(buf, buf->len+len+1)) {
+ if (len == -1 || !buffer_reserve(buf, buf->len+len+1)) {
va_end(ap_save);
return false;
}
diff --git a/buffer.h b/buffer.h
index 55ebb7d..759217a 100644
--- a/buffer.h
+++ b/buffer.h
@@ -19,7 +19,7 @@ void buffer_release(Buffer*);
/* set buffer size to zero, keep allocated memory */
void buffer_clear(Buffer*);
/* reserve space to store at least size bytes in this buffer.*/
-bool buffer_grow(Buffer*, size_t size);
+bool buffer_reserve(Buffer*, size_t size);
/* if buffer is not empty, make sure it is NUL terminated */
bool buffer_terminate(Buffer*);
/* replace buffer content with given data, growing the buffer if needed */
diff --git a/register.c b/register.c
index 2b188b2..2e630b0 100644
--- a/register.c
+++ b/register.c
@@ -61,7 +61,7 @@ bool register_put_range(Vis *vis, Register *reg, Text *txt, Filerange *range) {
case REGISTER_NORMAL:
{
size_t len = text_range_size(range);
- if (!buffer_grow(&reg->buf, len+1))
+ if (!buffer_reserve(&reg->buf, len+1))
return false;
reg->buf.len = text_bytes_get(txt, range->start, len, reg->buf.data);
return buffer_append(&reg->buf, "\0", 1);
@@ -91,7 +91,7 @@ bool register_append_range(Register *reg, Text *txt, Filerange *range) {
case REGISTER_NORMAL:
{
size_t len = text_range_size(range);
- if (!buffer_grow(&reg->buf, reg->buf.len + len + 1))
+ if (!buffer_reserve(&reg->buf, reg->buf.len + len + 1))
return false;
if (reg->buf.len > 0 && reg->buf.data[reg->buf.len-1] == '\0')
reg->buf.len--;