rename pa_hook_free() to pa_hook_done() since the hook struct is allocated on the...

diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c
index fd836fb228a5cfa728b7a733a150d04bb9db2aab..1907fcafb8fb637646c4e4a796bd1a7a3321eeee 100644 (file)
--- 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 0aac475910fe653b3c0e7fe1ea01dc6eadd63d44..396940382a06eb0687a3020aacf69bb3aa8c6433 100644 (file)
--- 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 cf85aca56c64dcfdb8a07b3e485f0cbd9b5e6535..de947ad56e99356597714b1623d5feacbca93b4e 100644 (file)
--- 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 60b965cd7e6c464fc7be56bfdb2c6c4047288eea..452e47765da072be9f46c0dc209e68de6aa20d55 100644 (file)
--- 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;
 }