From: Szymon Janc <szymon.janc@gmail.com>
Date: Mon, 25 Nov 2013 22:15:44 +0000 (+0000)
Subject: Rename device_device_set_name to btd_device_device_set_name
X-Git-Tag: android-x86-4.4-r3~6716
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e48206fe9ba405051fe9a9100bedc7ef27f8874f;p=android-x86%2Fexternal-bluetooth-bluez.git

Rename device_device_set_name to btd_device_device_set_name

Allow this symbol to be exported and usable from external plugins.
---

diff --git a/plugins/neard.c b/plugins/neard.c
index 073abec07..58689e667 100644
--- a/plugins/neard.c
+++ b/plugins/neard.c
@@ -640,7 +640,7 @@ static void store_params(struct btd_adapter *adapter, struct btd_device *device,
 
 	if (params->name) {
 		device_store_cached_name(device, params->name);
-		device_set_name(device, params->name);
+		btd_device_device_set_name(device, params->name);
 	}
 
 	/* TODO handle UUIDs? */
diff --git a/src/adapter.c b/src/adapter.c
index 8257e5889..135ca5b9c 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -4152,7 +4152,7 @@ static void update_found_devices(struct btd_adapter *adapter,
 	name_known = device_name_known(dev);
 
 	if (eir_data.name && (eir_data.name_complete || !name_known))
-		device_set_name(dev, eir_data.name);
+		btd_device_device_set_name(dev, eir_data.name);
 
 	if (eir_data.class != 0)
 		device_set_class(dev, eir_data.class);
@@ -5746,7 +5746,7 @@ static void connected_callback(uint16_t index, uint16_t length,
 
 	if (eir_data.name != NULL) {
 		device_store_cached_name(device, eir_data.name);
-		device_set_name(device, eir_data.name);
+		btd_device_device_set_name(device, eir_data.name);
 	}
 
 	eir_data_free(&eir_data);
diff --git a/src/device.c b/src/device.c
index e6523295c..58f24bf2d 100644
--- a/src/device.c
+++ b/src/device.c
@@ -2241,7 +2241,7 @@ char *btd_device_get_storage_path(struct btd_device *device,
 							filename);
 }
 
-void device_set_name(struct btd_device *device, const char *name)
+void btd_device_device_set_name(struct btd_device *device, const char *name)
 {
 	if (strncmp(name, device->name, MAX_NAME_LENGTH) == 0)
 		return;
diff --git a/src/device.h b/src/device.h
index f7e7bdca1..44bee3ef5 100644
--- a/src/device.h
+++ b/src/device.h
@@ -33,7 +33,7 @@ struct btd_device *device_create_from_storage(struct btd_adapter *adapter,
 char *btd_device_get_storage_path(struct btd_device *device,
 				const char *filename);
 
-void device_set_name(struct btd_device *device, const char *name);
+void btd_device_device_set_name(struct btd_device *device, const char *name);
 void device_store_cached_name(struct btd_device *dev, const char *name);
 void device_get_name(struct btd_device *device, char *name, size_t len);
 bool device_name_known(struct btd_device *device);