diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2008-06-05 13:35:58 +0000 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2008-06-05 13:35:58 +0000 |
| commit | 866d5e4f7af20b0527efb33188c5f9aaa0bc42e3 (patch) | |
| tree | 04b61a54c9449f363f6e38ce8e8fd1326d2907fd | |
| parent | dac5b3dfc9ce5091315294f938dc84188985dad6 (diff) | |
Fix bug introduced by previous cleanup
| -rw-r--r-- | hcid/dbus-hci.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/hcid/dbus-hci.c b/hcid/dbus-hci.c index 4822de9a..bfd564fb 100644 --- a/hcid/dbus-hci.c +++ b/hcid/dbus-hci.c @@ -1176,7 +1176,7 @@ void hcid_dbus_bonding_process_complete(bdaddr_t *local, bdaddr_t *peer, uint8_t status) { struct adapter *adapter; - char path[MAX_PATH_LENGTH], local_addr[18], peer_addr[18]; + char peer_addr[18]; const char *paddr = peer_addr; GSList *l; DBusMessage *reply; @@ -1185,7 +1185,6 @@ void hcid_dbus_bonding_process_complete(bdaddr_t *local, bdaddr_t *peer, void *d; gboolean paired = TRUE; - ba2str(local, local_addr); ba2str(peer, peer_addr); adapter = find_adapter(local); @@ -1195,8 +1194,8 @@ void hcid_dbus_bonding_process_complete(bdaddr_t *local, bdaddr_t *peer, } if (status) - cancel_passkey_agent_requests(adapter->passkey_agents, path, - peer); + cancel_passkey_agent_requests(adapter->passkey_agents, + adapter->path, peer); l = g_slist_find_custom(adapter->pin_reqs, peer, pin_req_cmp); if (!l) @@ -1214,7 +1213,7 @@ void hcid_dbus_bonding_process_complete(bdaddr_t *local, bdaddr_t *peer, device = adapter_get_device(connection, adapter, paddr); if (device) { - char *ptr = path + ADAPTER_PATH_INDEX; + char *ptr = adapter->path + ADAPTER_PATH_INDEX; device->temporary = FALSE; |