From 5b04fdb8d2d94ff5dcfb161418b414a10a86ed7a Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Thu, 3 Jan 2013 12:35:03 +0200 Subject: [PATCH] core: Rename adapter_init() to adapter_setup() --- src/adapter.c | 2 +- src/adapter.h | 2 +- src/manager.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/adapter.c b/src/adapter.c index 0f351e6cd..31a6b514a 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -2795,7 +2795,7 @@ static void load_config(struct btd_adapter *adapter) g_key_file_free(key_file); } -gboolean adapter_init(struct btd_adapter *adapter, gboolean powered, +gboolean adapter_setup(struct btd_adapter *adapter, gboolean powered, bool connectable, bool discoverable) { struct agent *agent; diff --git a/src/adapter.h b/src/adapter.h index 8090d98cb..572a0affa 100644 --- a/src/adapter.h +++ b/src/adapter.h @@ -93,7 +93,7 @@ void adapter_remove_device(struct btd_adapter *adapter, gboolean remove_storage); struct btd_adapter *adapter_create(int id); -gboolean adapter_init(struct btd_adapter *adapter, gboolean powered, +gboolean adapter_setup(struct btd_adapter *adapter, gboolean powered, bool connectable, bool discoverable); void adapter_remove(struct btd_adapter *adapter); void adapter_set_discovering(struct btd_adapter *adapter, diff --git a/src/manager.c b/src/manager.c index 484b8014c..6e0ff126b 100644 --- a/src/manager.c +++ b/src/manager.c @@ -162,7 +162,7 @@ struct btd_adapter *btd_manager_register_adapter(int id, gboolean powered, adapters = g_slist_append(adapters, adapter); - if (!adapter_init(adapter, powered, connectable, discoverable)) { + if (!adapter_setup(adapter, powered, connectable, discoverable)) { adapters = g_slist_remove(adapters, adapter); btd_adapter_unref(adapter); return NULL; -- 2.47.3