diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-08-04 07:00:04 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-04 07:00:04 +0400 |
| commit | bd89bd9e1c49369d9d08bf262602a7520cec7123 (patch) | |
| tree | f0d3fe425cc057df4c0db2efe5571970060deb31 /source/blender/blenlib/intern/buffer.c | |
| parent | 5881fe5d679b38eb40b59c1af3bc3db88a53f35d (diff) | |
avoid using MEM_reallocN_id directly, add utility macro for freeing.
Diffstat (limited to 'source/blender/blenlib/intern/buffer.c')
| -rw-r--r-- | source/blender/blenlib/intern/buffer.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/blenlib/intern/buffer.c b/source/blender/blenlib/intern/buffer.c index aac3a3bc3f3..36fb04a7bb7 100644 --- a/source/blender/blenlib/intern/buffer.c +++ b/source/blender/blenlib/intern/buffer.c @@ -34,9 +34,12 @@ static void *buffer_alloc(BLI_Buffer *buffer, int len) static void *buffer_realloc(BLI_Buffer *buffer, int len) { - return ((buffer->flag & BLI_BUFFER_USE_CALLOC) ? - MEM_recallocN : MEM_reallocN) - (buffer->data, (buffer->elem_size * len)); + if (buffer->flag & BLI_BUFFER_USE_CALLOC) { + return MEM_recallocN(buffer->data, buffer->elem_size * len); + } + else { + return MEM_reallocN(buffer->data, buffer->elem_size * len); + } } void BLI_buffer_resize(BLI_Buffer *buffer, int new_count) |