From: Peter Lieven <p...@kamp.de>
Signed-off-by: Peter Lieven <p...@kamp.de>
Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
Reviewed-by: Daniel P. Berrange <berra...@redhat.com>
Message-id: 1446203414-4013-18-git-send-email-kra...@redhat.com
---
util/buffer.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/util/buffer.c b/util/buffer.c
index ae2907e..31f1d9f 100644
--- a/util/buffer.c
+++ b/util/buffer.c
@@ -24,6 +24,13 @@
#define BUFFER_MIN_INIT_SIZE 4096
#define BUFFER_MIN_SHRINK_SIZE 65536
+static size_t buffer_req_size(Buffer *buffer, size_t len)
+{
+ return MAX(BUFFER_MIN_INIT_SIZE,
+ pow2ceil(buffer->offset + len));
+}
+
+
void buffer_init(Buffer *buffer, const char *name, ...)
{
va_list ap;
@@ -61,8 +68,7 @@ void buffer_reserve(Buffer *buffer, size_t len)
if ((buffer->capacity - buffer->offset) < len) {
old = buffer->capacity;
- buffer->capacity = pow2ceil(buffer->offset + len);
- buffer->capacity = MAX(buffer->capacity, BUFFER_MIN_INIT_SIZE);
+ buffer->capacity = buffer_req_size(buffer, len);
buffer->buffer = g_realloc(buffer->buffer, buffer->capacity);
trace_buffer_resize(buffer->name ?: "unnamed",
old, buffer->capacity);
--
1.8.3.1
