summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzymon Janc <szymon.janc@tieto.com>2012-10-05 14:54:37 +0200
committerJohan Hedberg <johan.hedberg@intel.com>2012-10-05 16:11:11 +0300
commit8d9ee2abb776533b17fec2addfa43a72b1616db3 (patch)
tree8c6f6c572250a01cef60401891aed031a9ca4309
parentd8697f72889d85d24f48e785aa430a3bea11d1f1 (diff)
downloadbluez-8d9ee2abb776533b17fec2addfa43a72b1616db3.tar.gz
adapter: Don't use adapter_get_address to access adapter address
Use struct btd_adapter directly to access bdaddr member.
-rw-r--r--src/adapter.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/adapter.c b/src/adapter.c
index 7e695b942..885d232c2 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -1884,7 +1884,7 @@ static void create_stored_device_from_ltks(char *key, char *value,
(GCompareFunc) device_address_cmp))
return;
- ba2str(adapter_get_address(adapter), srcaddr);
+ ba2str(&adapter->bdaddr, srcaddr);
if (g_strcmp0(srcaddr, address) == 0)
return;
@@ -3626,8 +3626,8 @@ ssize_t btd_adapter_get_pin(struct btd_adapter *adapter, struct btd_device *dev,
return ret;
}
- return read_pin_code(adapter_get_address(adapter),
- device_get_address(dev), pin_buf);
+ return read_pin_code(&adapter->bdaddr, device_get_address(dev),
+ pin_buf);
}
void btd_adapter_register_powered_callback(struct btd_adapter *adapter,