OSDN Git Service

core: Rename write_device_services according to what it actually does
authorJohan Hedberg <johan.hedberg@intel.com>
Fri, 14 Dec 2012 09:14:12 +0000 (11:14 +0200)
committerJohan Hedberg <johan.hedberg@intel.com>
Fri, 14 Dec 2012 09:14:24 +0000 (11:14 +0200)
src/device.c
src/storage.c
src/storage.h

index 7bde970..16ab381 100644 (file)
@@ -2874,7 +2874,7 @@ static void store_services(struct btd_device *device)
        struct btd_adapter *adapter = device->adapter;
        char *str = primary_list_to_string(device->primaries);
 
-       write_device_services(adapter_get_address(adapter), &device->bdaddr,
+       write_device_primaries(adapter_get_address(adapter), &device->bdaddr,
                                                device->bdaddr_type, str);
 
        g_free(str);
index eb06307..c622ff1 100644 (file)
@@ -338,7 +338,7 @@ int read_device_pairable(const bdaddr_t *bdaddr, gboolean *mode)
        return 0;
 }
 
-int write_device_services(const bdaddr_t *sba, const bdaddr_t *dba,
+int write_device_primaries(const bdaddr_t *sba, const bdaddr_t *dba,
                          uint8_t bdaddr_type, const char *services)
 {
        char filename[PATH_MAX + 1], key[20];
index 4a4a3db..e26753a 100644 (file)
@@ -40,7 +40,7 @@ int delete_record(const gchar *src, const gchar *dst, uint8_t dst_type,
                                                        const uint32_t handle);
 sdp_record_t *find_record_in_list(sdp_list_t *recs, const char *uuid);
 int read_device_pairable(const bdaddr_t *local, gboolean *mode);
-int write_device_services(const bdaddr_t *sba, const bdaddr_t *dba,
+int write_device_primaries(const bdaddr_t *sba, const bdaddr_t *dba,
                                uint8_t bdaddr_type, const char *services);
 int write_device_characteristics(const bdaddr_t *sba, const bdaddr_t *dba,
                                        uint8_t bdaddr_type, uint16_t handle,