[pulseaudio-discuss] [PATCH 3/3] bluetooth: Change function name add_matches to update_matches.

Tanu Kaskinen tanuk at iki.fi
Sun Jan 1 09:44:28 PST 2012


A function that is used for removing matches should not be
called add_matches.
---
 src/modules/bluetooth/module-bluetooth-proximity.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/bluetooth/module-bluetooth-proximity.c b/src/modules/bluetooth/module-bluetooth-proximity.c
index 9ba3fd8..3247017 100644
--- a/src/modules/bluetooth/module-bluetooth-proximity.c
+++ b/src/modules/bluetooth/module-bluetooth-proximity.c
@@ -325,7 +325,7 @@ finish:
     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
 
-static int add_matches(struct userdata *u, pa_bool_t add) {
+static int update_matches(struct userdata *u, pa_bool_t add) {
     char *filter1, *filter2;
     DBusError e;
     int r = -1;
@@ -401,7 +401,7 @@ int pa__init(pa_module*m) {
         goto fail;
     }
 
-    if (add_matches(u, TRUE) < 0)
+    if (update_matches(u, TRUE) < 0)
         goto fail;
 
     pa_assert_se(msg = dbus_message_new_method_call("org.bluez", u->hci_path, "org.bluez.Adapter", "ListBondings"));
@@ -476,7 +476,7 @@ void pa__done(pa_module*m) {
     }
 
     if (u->dbus_connection) {
-        add_matches(u, FALSE);
+        update_matches(u, FALSE);
         pa_dbus_connection_unref(u->dbus_connection);
     }
 
-- 
1.7.7.3



More information about the pulseaudio-discuss mailing list