summaryrefslogtreecommitdiffstats
path: root/polyp/mainloop-api.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/mainloop-api.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/mainloop-api.c')
-rw-r--r--polyp/mainloop-api.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/polyp/mainloop-api.c b/polyp/mainloop-api.c
index cce49c06..8b4e09ac 100644
--- a/polyp/mainloop-api.c
+++ b/polyp/mainloop-api.c
@@ -25,7 +25,9 @@
#include <assert.h>
#include <stdlib.h>
+
#include "mainloop-api.h"
+#include "xmalloc.h"
struct once_info {
void (*callback)(void *userdata);
@@ -38,7 +40,7 @@ static void once_callback(struct pa_mainloop_api *api, void *id, void *userdata)
i->callback(i->userdata);
assert(api->cancel_fixed);
api->cancel_fixed(api, id);
- free(i);
+ pa_xfree(i);
}
void pa_mainloop_api_once(struct pa_mainloop_api* api, void (*callback)(void *userdata), void *userdata) {
@@ -46,8 +48,7 @@ void pa_mainloop_api_once(struct pa_mainloop_api* api, void (*callback)(void *us
void *id;
assert(api && callback);
- i = malloc(sizeof(struct once_info));
- assert(i);
+ i = pa_xmalloc(sizeof(struct once_info));
i->callback = callback;
i->userdata = userdata;