summaryrefslogtreecommitdiffstats
path: root/polyp/protocol-cli.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/protocol-cli.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/protocol-cli.c')
-rw-r--r--polyp/protocol-cli.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/polyp/protocol-cli.c b/polyp/protocol-cli.c
index d6e69b54..11aeabe0 100644
--- a/polyp/protocol-cli.c
+++ b/polyp/protocol-cli.c
@@ -28,6 +28,7 @@
#include "protocol-cli.h"
#include "cli.h"
+#include "xmalloc.h"
struct pa_protocol_cli {
struct pa_module *module;
@@ -59,8 +60,7 @@ struct pa_protocol_cli* pa_protocol_cli_new(struct pa_core *core, struct pa_sock
struct pa_protocol_cli* p;
assert(core && server);
- p = malloc(sizeof(struct pa_protocol_cli));
- assert(p);
+ p = pa_xmalloc(sizeof(struct pa_protocol_cli));
p->module = m;
p->core = core;
p->server = server;
@@ -81,5 +81,5 @@ void pa_protocol_cli_free(struct pa_protocol_cli *p) {
pa_idxset_free(p->connections, free_connection, NULL);
pa_socket_server_free(p->server);
- free(p);
+ pa_xfree(p);
}