diff options
Diffstat (limited to 'src/pulsecore/memchunk.c')
-rw-r--r-- | src/pulsecore/memchunk.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/pulsecore/memchunk.c b/src/pulsecore/memchunk.c index 16a9c140..0bbf8590 100644 --- a/src/pulsecore/memchunk.c +++ b/src/pulsecore/memchunk.c @@ -1,5 +1,3 @@ -/* $Id$ */ - /*** This file is part of PulseAudio. @@ -49,17 +47,20 @@ pa_memchunk* pa_memchunk_make_writable(pa_memchunk *c, size_t min) { pa_memblock_get_length(c->memblock) >= c->index+min) return c; - l = c->length; - if (l < min) - l = min; + l = PA_MAX(c->length, min); n = pa_memblock_new(pa_memblock_get_pool(c->memblock), l); - tdata = pa_memblock_acquire(n); + sdata = pa_memblock_acquire(c->memblock); + tdata = pa_memblock_acquire(n); + memcpy(tdata, (uint8_t*) sdata + c->index, c->length); - pa_memblock_release(n); + pa_memblock_release(c->memblock); + pa_memblock_release(n); + pa_memblock_unref(c->memblock); + c->memblock = n; c->index = 0; @@ -69,8 +70,7 @@ pa_memchunk* pa_memchunk_make_writable(pa_memchunk *c, size_t min) { pa_memchunk* pa_memchunk_reset(pa_memchunk *c) { pa_assert(c); - c->memblock = NULL; - c->length = c->index = 0; + memset(c, 0, sizeof(*c)); return c; } |