core: Rename device_attach_attrib

This patch renames the device_attach_attrib function to
device_attach_att to remove ambiguities arise from the word "attrib".

diff --git a/src/attrib-server.c b/src/attrib-server.c
index 6571577..aa0012f 100644 (file)
--- a/src/attrib-server.c
+++ b/src/attrib-server.c
@@ -1300,7 +1300,7 @@ static void connect_event(GIOChannel *io, GError *gerr, void *user_data)
        if (!device)
                return;
 
-       device_attach_attrib(device, io);
+       device_attach_att(device, io);
 }
 
 static gboolean register_core_services(struct gatt_server *server)

diff --git a/src/device.c b/src/device.c
index 51fe402..bea4f22 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -3630,7 +3630,7 @@ static void gatt_client_init(struct btd_device *device)
        }
 }
 
-bool device_attach_attrib(struct btd_device *dev, GIOChannel *io)
+bool device_attach_att(struct btd_device *dev, GIOChannel *io)
 {
        GError *gerr = NULL;
        GAttrib *attrib;
@@ -3718,7 +3718,7 @@ static void att_connect_cb(GIOChannel *io, GError *gerr, gpointer user_data)
                goto done;
        }
 
-       if (!device_attach_attrib(device, io))
+       if (!device_attach_att(device, io))
                goto done;
 
        if (attcb->success)

diff --git a/src/device.h b/src/device.h
index 2e0473e..487bd27 100644 (file)
--- a/src/device.h
+++ b/src/device.h
@@ -69,7 +69,7 @@ struct gatt_primary *btd_device_get_primary(struct btd_device *device,
 GSList *btd_device_get_primaries(struct btd_device *device);
 void btd_device_gatt_set_service_changed(struct btd_device *device,
                                                uint16_t start, uint16_t end);
-bool device_attach_attrib(struct btd_device *dev, GIOChannel *io);
+bool device_attach_att(struct btd_device *dev, GIOChannel *io);
 void btd_device_add_uuid(struct btd_device *device, const char *uuid);
 void device_add_eir_uuids(struct btd_device *dev, GSList *uuids);
 void device_probe_profile(gpointer a, gpointer b);