diff options
| -rw-r--r-- | src/pulsecore/memchunk.c | 13 | ||||
| -rw-r--r-- | src/pulsecore/memchunk.h | 4 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/pulsecore/memchunk.c b/src/pulsecore/memchunk.c index f00cc9e7..20ddb11d 100644 --- a/src/pulsecore/memchunk.c +++ b/src/pulsecore/memchunk.c @@ -34,7 +34,7 @@ #include "memchunk.h" -void pa_memchunk_make_writable(pa_memchunk *c, size_t min) { +pa_memchunk* pa_memchunk_make_writable(pa_memchunk *c, size_t min) { pa_memblock *n; size_t l; void *tdata, *sdata; @@ -42,9 +42,10 @@ void pa_memchunk_make_writable(pa_memchunk *c, size_t min) { assert(c); assert(c->memblock); - if (pa_memblock_is_read_only(c->memblock) && + if (pa_memblock_ref_is_one(c->memblock) && + !pa_memblock_is_read_only(c->memblock) && pa_memblock_get_length(c->memblock) >= c->index+min) - return; + return c; l = c->length; if (l < min) @@ -59,11 +60,15 @@ void pa_memchunk_make_writable(pa_memchunk *c, size_t min) { pa_memblock_unref(c->memblock); c->memblock = n; c->index = 0; + + return c; } -void pa_memchunk_reset(pa_memchunk *c) { +pa_memchunk* pa_memchunk_reset(pa_memchunk *c) { assert(c); c->memblock = NULL; c->length = c->index = 0; + + return c; } diff --git a/src/pulsecore/memchunk.h b/src/pulsecore/memchunk.h index 0b982b6d..10cab2b9 100644 --- a/src/pulsecore/memchunk.h +++ b/src/pulsecore/memchunk.h @@ -38,10 +38,10 @@ typedef struct pa_memchunk { /* Make a memchunk writable, i.e. make sure that the caller may have * exclusive access to the memblock and it is not read_only. If needed * the memblock in the structure is replaced by a copy. */ -void pa_memchunk_make_writable(pa_memchunk *c, size_t min); +pa_memchunk* pa_memchunk_make_writable(pa_memchunk *c, size_t min); /* Invalidate a memchunk. This does not free the cotaining memblock, * but sets all members to zero. */ -void pa_memchunk_reset(pa_memchunk *c); +pa_memchunk* pa_memchunk_reset(pa_memchunk *c); #endif |