[pulseaudio-commits] src/modules src/pulsecore

[David Henningsson]

 src/modules/bluetooth/module-bluez4-device.c |    2 +-
 src/modules/bluetooth/module-bluez5-device.c |    2 +-
 src/modules/module-zeroconf-publish.c        |    2 +-
 src/pulsecore/core.c                         |    2 +-
 src/pulsecore/module.c                       |    7 +++----
 src/pulsecore/module.h                       |    2 +-
 6 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 96b368b960a4416a3d0c8b10d8fc1ab6ed636e58
Author: Kiran Krishnappa <kiraank at gmail.com>
Date:   Thu Jun 25 21:59:36 2015 +0530

    module: Remove redundant core argument from pa_module_unload()
    
    pa_module_unload() takes two pointers: pa_module and pa_core.
    The pa_core pointer is also available via the pa_module object,
    so the pa_core argument is redundant
    
    [David Henningsson: Rebased to git HEAD]

diff --git a/src/modules/bluetooth/module-bluez4-device.c b/src/modules/bluetooth/module-bluez4-device.c
index a23c2a9..9a921a5 100644
--- a/src/modules/bluetooth/module-bluez4-device.c
+++ b/src/modules/bluetooth/module-bluez4-device.c
@@ -2414,7 +2414,7 @@ static pa_hook_result_t discovery_hook_cb(pa_bluez4_discovery *y, const pa_bluez
     else
         return PA_HOOK_OK;
 
-    pa_module_unload(u->core, u->module, true);
+    pa_module_unload(u->module, true);
 
     return PA_HOOK_OK;
 }
diff --git a/src/modules/bluetooth/module-bluez5-device.c b/src/modules/bluetooth/module-bluez5-device.c
index 6ebcda2..84e6d55 100644
--- a/src/modules/bluetooth/module-bluez5-device.c
+++ b/src/modules/bluetooth/module-bluez5-device.c
@@ -2035,7 +2035,7 @@ static pa_hook_result_t device_connection_changed_cb(pa_bluetooth_discovery *y,
         return PA_HOOK_OK;
 
     pa_log_debug("Unloading module for device %s", d->path);
-    pa_module_unload(u->core, u->module, true);
+    pa_module_unload(u->module, true);
 
     return PA_HOOK_OK;
 }
diff --git a/src/modules/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c
index ac139e9..ceedfe0 100644
--- a/src/modules/module-zeroconf-publish.c
+++ b/src/modules/module-zeroconf-publish.c
@@ -643,7 +643,7 @@ static int avahi_process_msg(pa_msgobject *o, int code, void *data, int64_t offs
             break;
 
         case AVAHI_MESSAGE_SHUTDOWN_START:
-            pa_module_unload(u->core, u->module, true);
+            pa_module_unload(u->module, true);
             break;
 
         default:
diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c
index 0e63bac..43fd30e 100644
--- a/src/pulsecore/core.c
+++ b/src/pulsecore/core.c
@@ -51,7 +51,7 @@ static int core_process_msg(pa_msgobject *o, int code, void *userdata, int64_t o
     switch (code) {
 
         case PA_CORE_MESSAGE_UNLOAD_MODULE:
-            pa_module_unload(c, userdata, true);
+            pa_module_unload(userdata, true);
             return 0;
 
         default:
diff --git a/src/pulsecore/module.c b/src/pulsecore/module.c
index 2dd64b5..7cba3a7 100644
--- a/src/pulsecore/module.c
+++ b/src/pulsecore/module.c
@@ -259,14 +259,13 @@ static void pa_module_free(pa_module *m) {
     pa_xfree(m);
 }
 
-void pa_module_unload(pa_core *c, pa_module *m, bool force) {
-    pa_assert(c);
+void pa_module_unload(pa_module *m, bool force) {
     pa_assert(m);
 
     if (m->core->disallow_module_loading && !force)
         return;
 
-    if (!(m = pa_idxset_remove_by_data(c->modules, m, NULL)))
+    if (!(m = pa_idxset_remove_by_data(m->core->modules, m, NULL)))
         return;
 
     pa_module_free(m);
@@ -334,7 +333,7 @@ static void defer_cb(pa_mainloop_api*api, pa_defer_event *e, void *userdata) {
     api->defer_enable(e, 0);
 
     while ((m = pa_hashmap_first(c->modules_pending_unload)))
-        pa_module_unload(c, m, true);
+        pa_module_unload(m, true);
 }
 
 void pa_module_unload_request(pa_module *m, bool force) {
diff --git a/src/pulsecore/module.h b/src/pulsecore/module.h
index 3889156..41e2189 100644
--- a/src/pulsecore/module.h
+++ b/src/pulsecore/module.h
@@ -54,7 +54,7 @@ bool pa_module_exists(const char *name);
 
 pa_module* pa_module_load(pa_core *c, const char *name, const char *argument);
 
-void pa_module_unload(pa_core *c, pa_module *m, bool force);
+void pa_module_unload(pa_module *m, bool force);
 void pa_module_unload_by_index(pa_core *c, uint32_t idx, bool force);
 
 void pa_module_unload_request(pa_module *m, bool force);