diff options
author | Lennart Poettering <lennart@poettering.net> | 2004-08-04 16:39:30 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2004-08-04 16:39:30 +0000 |
commit | 46091a9237f17f4295dca7140d8d70b4fce8b357 (patch) | |
tree | 1c600cd6e1801586abfb66d767f2cd96e15c819c /polyp/memblockq.c | |
parent | 24291aff27c671c11619684cb10d3b36fdf87c0d (diff) |
introduce pa_xmalloc() and friends
implement module auto loading
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@103 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'polyp/memblockq.c')
-rw-r--r-- | polyp/memblockq.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/polyp/memblockq.c b/polyp/memblockq.c index eff923b9..4019c893 100644 --- a/polyp/memblockq.c +++ b/polyp/memblockq.c @@ -30,6 +30,7 @@ #include <stdlib.h> #include "memblockq.h" +#include "xmalloc.h" struct memblock_list { struct memblock_list *next; @@ -50,8 +51,7 @@ struct pa_memblockq* pa_memblockq_new(size_t maxlength, size_t tlength, size_t b struct pa_memblockq* bq; assert(maxlength && base && maxlength); - bq = malloc(sizeof(struct pa_memblockq)); - assert(bq); + bq = pa_xmalloc(sizeof(struct pa_memblockq)); bq->blocks = bq->blocks_tail = 0; bq->n_blocks = 0; @@ -97,10 +97,10 @@ void pa_memblockq_free(struct pa_memblockq* bq) { while ((l = bq->blocks)) { bq->blocks = l->next; pa_memblock_unref(l->chunk.memblock); - free(l); + pa_xfree(l); } - free(bq); + pa_xfree(bq); } void pa_memblockq_push(struct pa_memblockq* bq, const struct pa_memchunk *chunk, size_t delta) { @@ -119,8 +119,7 @@ void pa_memblockq_push(struct pa_memblockq* bq, const struct pa_memchunk *chunk, } } - q = malloc(sizeof(struct memblock_list)); - assert(q); + q = pa_xmalloc(sizeof(struct memblock_list)); if (bq->measure_delay) gettimeofday(&q->stamp, NULL); @@ -181,7 +180,7 @@ int memblockq_pop(struct memblockq* bq, struct pa_memchunk *chunk) { bq->n_blocks--; bq->current_length -= chunk->length; - free(q); + pa_xfree(q); return 0; } */ @@ -231,7 +230,7 @@ void pa_memblockq_drop(struct pa_memblockq *bq, size_t length) { if (bq->blocks == NULL) bq->blocks_tail = NULL; pa_memblock_unref(q->chunk.memblock); - free(q); + pa_xfree(q); bq->n_blocks--; } |