From 07104395d1084e91bd3fce6a5ea20b15e489ba32 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Thu, 3 Jan 2013 12:52:55 +0200 Subject: [PATCH] core: Prefer adapter_find functions over manager ones --- src/rfkill.c | 3 +-- src/sdpd-database.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/rfkill.c b/src/rfkill.c index bac9efd66..6f040c9a7 100644 --- a/src/rfkill.c +++ b/src/rfkill.c @@ -37,7 +37,6 @@ #include "log.h" #include "adapter.h" -#include "manager.h" #include "hcid.h" enum rfkill_type { @@ -128,7 +127,7 @@ static gboolean rfkill_event(GIOChannel *chan, if (id < 0) return TRUE; - adapter = manager_find_adapter_by_id(id); + adapter = adapter_find_by_id(id); if (!adapter) return TRUE; diff --git a/src/sdpd-database.c b/src/sdpd-database.c index 177ca9662..d4ff115c6 100644 --- a/src/sdpd-database.c +++ b/src/sdpd-database.c @@ -192,7 +192,7 @@ void sdp_record_add(const bdaddr_t *device, sdp_record_t *rec) return; } - adapter = manager_find_adapter(device); + adapter = adapter_find(device); if (adapter) adapter_service_insert(adapter, rec); } @@ -267,7 +267,7 @@ int sdp_record_remove(uint32_t handle) a = p->data; if (bacmp(&a->device, BDADDR_ANY) != 0) { - struct btd_adapter *adapter = manager_find_adapter(&a->device); + struct btd_adapter *adapter = adapter_find(&a->device); if (adapter) adapter_service_remove(adapter, r); } else -- 2.47.3