From a4cbf5540b53cf4b0558c5d420354aa1b3421d61 Mon Sep 17 00:00:00 2001 From: Alok Barsode Date: Thu, 28 Aug 2008 15:22:40 +0530 Subject: Renaming found_device_remove to adapter_remove_found_device and moving it to adapter.c --- src/dbus-hci.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'src/dbus-hci.c') diff --git a/src/dbus-hci.c b/src/dbus-hci.c index b79318d2..f0129005 100644 --- a/src/dbus-hci.c +++ b/src/dbus-hci.c @@ -110,25 +110,6 @@ int found_device_cmp(const struct remote_dev_info *d1, return 0; } -static int found_device_remove(GSList **list, bdaddr_t *bdaddr) -{ - struct remote_dev_info *dev, match; - GSList *l; - - memset(&match, 0, sizeof(struct remote_dev_info)); - bacpy(&match.bdaddr, bdaddr); - - l = g_slist_find_custom(*list, &match, (GCompareFunc) found_device_cmp); - if (!l) - return -1; - - dev = l->data; - *list = g_slist_remove(*list, dev); - g_free(dev); - - return 0; -} - int active_conn_find_by_bdaddr(const void *data, const void *user_data) { const struct active_conn_info *con = data; @@ -1311,7 +1292,7 @@ void hcid_dbus_remote_name(bdaddr_t *local, bdaddr_t *peer, uint8_t status, } /* remove from remote name request list */ - found_device_remove(&adapter->found_devices, peer); + adapter_remove_found_device(adapter, peer); /* check if there is more devices to request names */ if (!found_device_req_name(adapter)) -- cgit