diff options
author | Lennart Poettering <lennart@poettering.net> | 2008-08-03 16:21:08 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2008-08-03 16:31:49 +0200 |
commit | 084f4292f6d1f36ae175b9fd1de070dc942ff29e (patch) | |
tree | 5c1fc12870db2a428e56836bbf4abe587038bcf3 | |
parent | 34c435480fc2c6110994efac5ab85e27bcd653d9 (diff) |
rename pa_hook_free() to pa_hook_done() since the hook struct is allocated on the stack not via malloc
-rw-r--r-- | src/pulsecore/core.c | 2 | ||||
-rw-r--r-- | src/pulsecore/hook-list.c | 2 | ||||
-rw-r--r-- | src/pulsecore/hook-list.h | 2 | ||||
-rw-r--r-- | src/tests/hook-list-test.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c index fd836fb2..1907fcaf 100644 --- a/src/pulsecore/core.c +++ b/src/pulsecore/core.c @@ -192,7 +192,7 @@ static void core_free(pa_object *o) { pa_shared_cleanup(c); for (j = 0; j < PA_CORE_HOOK_MAX; j++) - pa_hook_free(&c->hooks[j]); + pa_hook_done(&c->hooks[j]); pa_xfree(c); } diff --git a/src/pulsecore/hook-list.c b/src/pulsecore/hook-list.c index 0aac4759..39694038 100644 --- a/src/pulsecore/hook-list.c +++ b/src/pulsecore/hook-list.c @@ -44,7 +44,7 @@ static void slot_free(pa_hook *hook, pa_hook_slot *slot) { pa_xfree(slot); } -void pa_hook_free(pa_hook *hook) { +void pa_hook_done(pa_hook *hook) { pa_assert(hook); pa_assert(hook->n_firing == 0); diff --git a/src/pulsecore/hook-list.h b/src/pulsecore/hook-list.h index cf85aca5..de947ad5 100644 --- a/src/pulsecore/hook-list.h +++ b/src/pulsecore/hook-list.h @@ -64,7 +64,7 @@ struct pa_hook { }; void pa_hook_init(pa_hook *hook, void *data); -void pa_hook_free(pa_hook *hook); +void pa_hook_done(pa_hook *hook); pa_hook_slot* pa_hook_connect(pa_hook *hook, pa_hook_priority_t prio, pa_hook_cb_t cb, void *data); void pa_hook_slot_free(pa_hook_slot *slot); diff --git a/src/tests/hook-list-test.c b/src/tests/hook-list-test.c index 60b965cd..452e4776 100644 --- a/src/tests/hook-list-test.c +++ b/src/tests/hook-list-test.c @@ -31,7 +31,7 @@ int main(int argc, char *argv[]) { pa_hook_fire(&hook, (void*) "call2"); - pa_hook_free(&hook); + pa_hook_done(&hook); return 0; } |