OSDN Git Service

Rename device_device_set_name to btd_device_device_set_name
authorSzymon Janc <szymon.janc@gmail.com>
Mon, 25 Nov 2013 22:15:44 +0000 (22:15 +0000)
committerJohan Hedberg <johan.hedberg@intel.com>
Wed, 27 Nov 2013 09:20:23 +0000 (11:20 +0200)
Allow this symbol to be exported and usable from external plugins.

plugins/neard.c
src/adapter.c
src/device.c
src/device.h

index 073abec..58689e6 100644 (file)
@@ -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? */
index 8257e58..135ca5b 100644 (file)
@@ -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);
index e652329..58f24bf 100644 (file)
@@ -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;
index f7e7bdc..44bee3e 100644 (file)
@@ -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);