From ff68db77d68574dc3e87aa378f1b4382ae805b2c Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Wed, 19 Dec 2012 10:37:14 +0200 Subject: [PATCH] core: Access device struct internals directly in device.c --- src/device.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/device.c b/src/device.c index 3e57191fd..8bfcb30ed 100644 --- a/src/device.c +++ b/src/device.c @@ -3678,7 +3678,7 @@ static void pincode_cb(struct agent *agent, DBusError *err, const char *pin, if (auth->agent == NULL) return; - btd_adapter_pincode_reply(device->adapter, device_get_address(device), + btd_adapter_pincode_reply(device->adapter, &device->bdaddr, pin, pin ? strlen(pin) : 0); agent_unref(device->authr->agent); @@ -3694,9 +3694,9 @@ static void confirm_cb(struct agent *agent, DBusError *err, void *data) if (auth->agent == NULL) return; - btd_adapter_confirm_reply(device->adapter, device_get_address(device), - device_get_addr_type(device), - err ? FALSE : TRUE); + btd_adapter_confirm_reply(device->adapter, &device->bdaddr, + device->bdaddr_type, + err ? FALSE : TRUE); agent_unref(device->authr->agent); device->authr->agent = NULL; @@ -3715,8 +3715,8 @@ static void passkey_cb(struct agent *agent, DBusError *err, if (err) passkey = INVALID_PASSKEY; - btd_adapter_passkey_reply(device->adapter, device_get_address(device), - device_get_addr_type(device), passkey); + btd_adapter_passkey_reply(device->adapter, &device->bdaddr, + device->bdaddr_type, passkey); agent_unref(device->authr->agent); device->authr->agent = NULL; -- 2.47.3