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/mainloop-signal.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/mainloop-signal.c')
-rw-r--r-- | polyp/mainloop-signal.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/polyp/mainloop-signal.c b/polyp/mainloop-signal.c index 642ca5e0..6e79767a 100644 --- a/polyp/mainloop-signal.c +++ b/polyp/mainloop-signal.c @@ -33,6 +33,7 @@ #include "mainloop-signal.h" #include "util.h" +#include "xmalloc.h" struct signal_info { int sig; @@ -122,8 +123,7 @@ void* pa_signal_register(int sig, void (*callback) (void *id, int signal, void * if (s->sig == sig) goto fail; - s = malloc(sizeof(struct signal_info)); - assert(s); + s = pa_xmalloc(sizeof(struct signal_info)); s->sig = sig; s->callback = callback; s->userdata = userdata; @@ -143,7 +143,7 @@ void* pa_signal_register(int sig, void (*callback) (void *id, int signal, void * return s; fail: if (s) - free(s); + pa_xfree(s); return NULL; } @@ -159,5 +159,5 @@ void pa_signal_unregister(void *id) { signals = s->next; sigaction(s->sig, &s->saved_sigaction, NULL); - free(s); + pa_xfree(s); } |