diff options
author | Lennart Poettering <lennart@poettering.net> | 2004-06-15 17:05:03 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2004-06-15 17:05:03 +0000 |
commit | b24546bedee168778a7aef11200dfb0378dfae43 (patch) | |
tree | 8fc0c27f32ff7b3c3cfd517ca724444c3e59904d /src/client.c | |
parent | 78f386ad45dc046d673fca5441dff188a7297059 (diff) |
cleanup
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@18 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/client.c')
-rw-r--r-- | src/client.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/client.c b/src/client.c index 578d51c3..1b84c6bf 100644 --- a/src/client.c +++ b/src/client.c @@ -12,11 +12,12 @@ struct client *client_new(struct core *core, const char *protocol_name, char *na c = malloc(sizeof(struct client)); assert(c); - c->protocol_name = protocol_name; c->name = name ? strdup(name) : NULL; - c->kill = NULL; - c->kill_userdata = NULL; c->core = core; + c->protocol_name = protocol_name; + + c->kill = NULL; + c->userdata = NULL; r = idxset_put(core->clients, c, &c->index); assert(c->index != IDXSET_INVALID && r >= 0); @@ -35,14 +36,9 @@ void client_free(struct client *c) { free(c); } -void client_set_kill_callback(struct client *c, void (*kill)(struct client *c, void *userdata), void *userdata) { - assert(c && kill); - c->kill = kill; - c->kill_userdata = userdata; -} - void client_kill(struct client *c) { assert(c); - c->kill(c, c->kill_userdata); + if (c->kill) + c->kill(c); } |