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/cli.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/cli.c')
| -rw-r--r-- | polyp/cli.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/polyp/cli.c b/polyp/cli.c index f2aa5a65..f0ad4830 100644 --- a/polyp/cli.c +++ b/polyp/cli.c @@ -41,6 +41,7 @@ #include "namereg.h" #include "clitext.h" #include "cli-command.h" +#include "xmalloc.h" struct pa_cli { struct pa_core *core; @@ -65,8 +66,7 @@ struct pa_cli* pa_cli_new(struct pa_core *core, struct pa_iochannel *io, struct struct pa_cli *c; assert(io); - c = malloc(sizeof(struct pa_cli)); - assert(c); + c = pa_xmalloc(sizeof(struct pa_cli)); c->core = core; c->line = pa_ioline_new(io); assert(c->line); @@ -95,7 +95,7 @@ void pa_cli_free(struct pa_cli *c) { assert(c); pa_ioline_free(c->line); pa_client_free(c->client); - free(c); + pa_xfree(c); } static void client_kill(struct pa_client *client) { @@ -132,7 +132,7 @@ static void line_callback(struct pa_ioline *line, const char *s, void *userdata) pa_cli_command_execute_line(c->core, s, buf, &c->fail, &c->verbose); c->defer_kill--; pa_ioline_puts(line, p = pa_strbuf_tostring_free(buf)); - free(p); + pa_xfree(p); if (c->kill_requested) { if (c->eof_callback) |