From: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
This adds btd_ prefix to device_is_trusted so it can be used by
plugins.
---
src/adapter.c | 2 +-
src/device.c | 8 ++++----
src/device.h | 2 +-
src/gatt-database.c | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/adapter.c b/src/adapter.c
index b159d2135..10432b734 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -7334,7 +7334,7 @@ static gboolean process_auth_queue(gpointer user_data)
goto next;
}
- if (device_is_trusted(device) == TRUE) {
+ if (btd_device_is_trusted(device) == TRUE) {
auth->cb(NULL, auth->user_data);
goto next;
}
diff --git a/src/device.c b/src/device.c
index 775003796..60762ac35 100644
--- a/src/device.c
+++ b/src/device.c
@@ -257,7 +257,7 @@ struct btd_device {
sdp_list_t *tmp_records;
- gboolean trusted;
+ bool trusted;
gboolean blocked;
gboolean auto_connect;
gboolean disable_auto_connect;
@@ -826,7 +826,7 @@ bool device_is_bonded(struct btd_device *device, uint8_t bdaddr_type)
return state->bonded;
}
-gboolean device_is_trusted(struct btd_device *device)
+bool btd_device_is_trusted(struct btd_device *device)
{
return device->trusted;
}
@@ -1163,7 +1163,7 @@ static gboolean dev_property_get_trusted(const GDBusPropertyTable *property,
DBusMessageIter *iter, void *data)
{
struct btd_device *device = data;
- gboolean val = device_is_trusted(device);
+ gboolean val = btd_device_is_trusted(device);
dbus_message_iter_append_basic(iter, DBUS_TYPE_BOOLEAN, &val);
@@ -6031,7 +6031,7 @@ void device_bonding_complete(struct btd_device *device, uint8_t bdaddr_type,
* treated as a newly discovered device.
*/
if (!device_is_paired(device, bdaddr_type) &&
- !device_is_trusted(device))
+ !btd_device_is_trusted(device))
btd_device_set_temporary(device, true);
device_bonding_failed(device, status);
diff --git a/src/device.h b/src/device.h
index d7f886224..004d3a78b 100644
--- a/src/device.h
+++ b/src/device.h
@@ -88,7 +88,7 @@ gboolean device_is_temporary(struct btd_device *device);
bool device_is_connectable(struct btd_device *device);
bool device_is_paired(struct btd_device *device, uint8_t bdaddr_type);
bool device_is_bonded(struct btd_device *device, uint8_t bdaddr_type);
-gboolean device_is_trusted(struct btd_device *device);
+bool btd_device_is_trusted(struct btd_device *device);
void device_set_paired(struct btd_device *dev, uint8_t bdaddr_type);
void device_set_unpaired(struct btd_device *dev, uint8_t bdaddr_type);
void btd_device_set_temporary(struct btd_device *device, bool temporary);
diff --git a/src/gatt-database.c b/src/gatt-database.c
index cf651b5f5..db8432c6b 100644
--- a/src/gatt-database.c
+++ b/src/gatt-database.c
@@ -2989,7 +2989,7 @@ static void desc_write_cb(struct gatt_db_attribute *attrib,
}
if (opcode == BT_ATT_OP_PREP_WRITE_REQ) {
- if (!device_is_trusted(device) && !desc->prep_authorized &&
+ if (!btd_device_is_trusted(device) && !desc->prep_authorized &&
desc->req_prep_authorization)
send_write(att, attrib, desc->proxy,
desc->pending_writes, id, value, len,
@@ -3120,7 +3120,7 @@ static void chrc_write_cb(struct gatt_db_attribute *attrib,
queue = NULL;
if (opcode == BT_ATT_OP_PREP_WRITE_REQ) {
- if (!device_is_trusted(device) && !chrc->prep_authorized &&
+ if (!btd_device_is_trusted(device) && !chrc->prep_authorized &&
chrc->req_prep_authorization)
send_write(att, attrib, chrc->proxy, queue,
id, value, len, offset,
--
2.37.1
