From d29d258758de88d2d438631560b2ad324841f98e Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 5 Jan 2013 15:29:08 -0800 Subject: [PATCH] plugins: Use btd_adapter_get_index instead of adapter_get_dev_id --- plugins/hostname.c | 5 +++-- plugins/neard.c | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/plugins/hostname.c b/plugins/hostname.c index daab715d7..0b75fac20 100644 --- a/plugins/hostname.c +++ b/plugins/hostname.c @@ -64,10 +64,11 @@ static void update_name(struct btd_adapter *adapter, gpointer user_data) adapter_set_name(adapter, pretty_hostname); } else { - int dev_id = adapter_get_dev_id(adapter); + uint16_t index = btd_adapter_get_index(adapter); char *str; - str = g_strdup_printf("%s #%u", pretty_hostname, dev_id + 1); + /* Avoid "some device #0" names, start at #1 */ + str = g_strdup_printf("%s #%u", pretty_hostname, index + 1); DBG("name: %s", str); diff --git a/plugins/neard.c b/plugins/neard.c index 4d52e077d..187ed3803 100644 --- a/plugins/neard.c +++ b/plugins/neard.c @@ -295,7 +295,7 @@ static int process_eir(struct btd_adapter *adapter, uint8_t *eir, size_t size, ba2str(&eir_data.addr, remote_address); - DBG("hci%u remote:%s", adapter_get_dev_id(adapter), remote_address); + DBG("hci%u remote:%s", btd_adapter_get_index(adapter), remote_address); device = adapter_get_device(adapter, remote_address, BDADDR_BREDR); @@ -494,7 +494,7 @@ static int process_nokia_com_bt(struct btd_adapter *adapter, void *data, return ret; ba2str(&nokia.address, remote_address); - DBG("hci%u remote:%s", adapter_get_dev_id(adapter), remote_address); + DBG("hci%u remote:%s", btd_adapter_get_index(adapter), remote_address); device = adapter_get_device(adapter, remote_address, BDADDR_BREDR); @@ -504,7 +504,7 @@ static int process_nokia_com_bt(struct btd_adapter *adapter, void *data, return ret; } - DBG("hci%u remote:%s", adapter_get_dev_id(adapter), remote_address); + DBG("hci%u remote:%s", btd_adapter_get_index(adapter), remote_address); if (nokia.name) { adapter_store_cached_name(adapter_get_address(adapter), remote, -- 2.47.3