summaryrefslogtreecommitdiffstats
path: root/polyp/scache.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2004-08-04 16:39:30 +0000
committerLennart Poettering <lennart@poettering.net>2004-08-04 16:39:30 +0000
commit46091a9237f17f4295dca7140d8d70b4fce8b357 (patch)
tree1c600cd6e1801586abfb66d767f2cd96e15c819c /polyp/scache.c
parent24291aff27c671c11619684cb10d3b36fdf87c0d (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/scache.c')
-rw-r--r--polyp/scache.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/polyp/scache.c b/polyp/scache.c
index 21af0e22..fd7b74e5 100644
--- a/polyp/scache.c
+++ b/polyp/scache.c
@@ -8,13 +8,14 @@
#include "mainloop.h"
#include "sample-util.h"
#include "play-memchunk.h"
+#include "xmalloc.h"
static void free_entry(struct pa_scache_entry *e) {
assert(e);
- free(e->name);
+ pa_xfree(e->name);
if (e->memchunk.memblock)
pa_memblock_unref(e->memchunk.memblock);
- free(e);
+ pa_xfree(e);
}
void pa_scache_add_item(struct pa_core *c, const char *name, struct pa_sample_spec *ss, struct pa_memchunk *chunk, uint32_t *index) {
@@ -28,10 +29,8 @@ void pa_scache_add_item(struct pa_core *c, const char *name, struct pa_sample_sp
pa_memblock_unref(e->memchunk.memblock);
} else {
put = 1;
- e = malloc(sizeof(struct pa_scache_entry));
- assert(e);
- e->name = strdup(name);
- assert(e->name);
+ e = pa_xmalloc(sizeof(struct pa_scache_entry));
+ e->name = pa_xstrdup(name);
}
e->volume = 0x100;