[BlueZ 2/4] src: Prefix plugin-accessible adapter_set_name() function
flat view
STALE273d
From: Bastien Nocera <hadess@hadess.net>
Date: 2026-01-19 14:12:49
Subsystem:
the rest · Maintainer:
Linus Torvalds
Plugin-accessible functions are usually prefixed with btd_ to avoid confusing them with internal private functions. Rename adapter_set_name() to match the existing btd_adapter_set_class(). --- plugins/hostname.c | 4 ++-- src/adapter.c | 2 +- src/adapter.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/plugins/hostname.c b/plugins/hostname.c
index 35420e5d587b..c827506275aa 100644
--- a/plugins/hostname.c
+++ b/plugins/hostname.c@@ -82,7 +82,7 @@ static void update_name(struct btd_adapter *adapter, gpointer user_data) if (btd_adapter_is_default(adapter)) { DBG("name: %s", hostname); - adapter_set_name(adapter, hostname); + btd_adapter_set_name(adapter, hostname); } else { uint16_t index = btd_adapter_get_index(adapter); char *str;
@@ -92,7 +92,7 @@ static void update_name(struct btd_adapter *adapter, gpointer user_data) DBG("name: %s", str); - adapter_set_name(adapter, str); + btd_adapter_set_name(adapter, str); g_free(str); }
diff --git a/src/adapter.c b/src/adapter.c
index a5de7cee1552..3bbee2e36810 100644
--- a/src/adapter.c
+++ b/src/adapter.c@@ -998,7 +998,7 @@ static int set_name(struct btd_adapter *adapter, const char *name) return -EIO; } -int adapter_set_name(struct btd_adapter *adapter, const char *name) +int btd_adapter_set_name(struct btd_adapter *adapter, const char *name) { if (g_strcmp0(adapter->system_name, name) == 0) return 0;
diff --git a/src/adapter.h b/src/adapter.h
index dd0c90d9cb3a..e562b1bcd4da 100644
--- a/src/adapter.h
+++ b/src/adapter.h@@ -100,7 +100,6 @@ const char *adapter_get_path(struct btd_adapter *adapter); const bdaddr_t *btd_adapter_get_address(struct btd_adapter *adapter); uint8_t btd_adapter_get_address_type(struct btd_adapter *adapter); const char *btd_adapter_get_storage_dir(struct btd_adapter *adapter); -int adapter_set_name(struct btd_adapter *adapter, const char *name); int adapter_service_add(struct btd_adapter *adapter, sdp_record_t *rec); void adapter_service_remove(struct btd_adapter *adapter, uint32_t handle);
@@ -114,6 +113,7 @@ void btd_adapter_unref(struct btd_adapter *adapter); void btd_adapter_set_class(struct btd_adapter *adapter, uint8_t major, uint8_t minor); +int btd_adapter_set_name(struct btd_adapter *adapter, const char *name); struct btd_adapter_driver { const char *name;
--
2.52.0