From b9dea0f94159f4b64e65ec80314d393107d4eb28 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 24 Dec 2015 01:52:54 +1100 Subject: Remove BLI_buffer calloc option This wasn't working reliably (after clear for example), and wasn't used anywhere. --- source/blender/blenlib/intern/buffer.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) (limited to 'source/blender/blenlib/intern/buffer.c') diff --git a/source/blender/blenlib/intern/buffer.c b/source/blender/blenlib/intern/buffer.c index fb1b733fc8a..a54fc2428fe 100644 --- a/source/blender/blenlib/intern/buffer.c +++ b/source/blender/blenlib/intern/buffer.c @@ -56,16 +56,12 @@ static void *buffer_alloc(BLI_Buffer *buffer, const size_t len) { - return ((buffer->flag & BLI_BUFFER_USE_CALLOC) ? - MEM_callocN : MEM_mallocN) - (buffer->elem_size * len, "BLI_Buffer.data"); + return MEM_mallocN(buffer->elem_size * len, "BLI_Buffer.data"); } static void *buffer_realloc(BLI_Buffer *buffer, const size_t len) { - return ((buffer->flag & BLI_BUFFER_USE_CALLOC) ? - MEM_recallocN_id : MEM_reallocN_id) - (buffer->data, buffer->elem_size * len, "BLI_Buffer.data"); + return MEM_reallocN_id(buffer->data, buffer->elem_size * len, "BLI_Buffer.data"); } void BLI_buffer_resize(BLI_Buffer *buffer, const size_t new_count) @@ -90,14 +86,6 @@ void BLI_buffer_resize(BLI_Buffer *buffer, const size_t new_count) buffer->data = buffer_realloc(buffer, buffer->alloc_count); } } - else { - if (buffer->flag & BLI_BUFFER_USE_CALLOC) { - if (new_count > buffer->count) { - memset(POINTER_OFFSET(buffer->data, buffer->elem_size * buffer->count), 0, - buffer->elem_size * (new_count - buffer->count)); - } - } - } buffer->count = new_count; } @@ -126,12 +114,6 @@ void BLI_buffer_reinit(BLI_Buffer *buffer, const size_t new_count) buffer->flag &= ~BLI_BUFFER_USE_STATIC; buffer->data = buffer_alloc(buffer, buffer->alloc_count); } - else { - if (buffer->flag & BLI_BUFFER_USE_CALLOC) { - memset(buffer->data, 0, - buffer->elem_size * new_count); - } - } buffer->count = new_count; } -- cgit v1.2.3