summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Kolodziejczyk <grzegorz.kolodziejczyk@tieto.com>2014-03-24 15:27:23 +0100
committerSzymon Janc <szymon.janc@tieto.com>2014-03-25 11:34:25 +0100
commit350107b3c4b53bf9459eb7e353595fe878c08f2b (patch)
tree447473d9cacca1a607ab5dc338ce72ed55a54020
parentf3e500b00805713277a4a03b314baf43dac4b2ee (diff)
downloadbluez-350107b3c4b53bf9459eb7e353595fe878c08f2b.tar.gz
android/gatt: Keep client notify functions names consistent
We should use consistent names for client notify functions.
-rw-r--r--android/gatt.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/android/gatt.c b/android/gatt.c
index 813588bbc..0414c4f71 100644
--- a/android/gatt.c
+++ b/android/gatt.c
@@ -292,7 +292,7 @@ static void connection_cleanup(struct gatt_device *device)
}
}
-static void send_disconnect_notify(int32_t id, struct gatt_device *dev,
+static void send_client_disconnect_notify(int32_t id, struct gatt_device *dev,
uint8_t status)
{
struct hal_ev_gatt_client_disconnect ev;
@@ -306,12 +306,12 @@ static void send_disconnect_notify(int32_t id, struct gatt_device *dev,
HAL_EV_GATT_CLIENT_DISCONNECT, sizeof(ev), &ev);
}
-static void disconnect_notify(void *data, void *user_data)
+static void client_disconnect_notify(void *data, void *user_data)
{
struct gatt_device *dev = user_data;
int32_t id = PTR_TO_INT(data);
- send_disconnect_notify(id, dev, HAL_STATUS_SUCCESS);
+ send_client_disconnect_notify(id, dev, HAL_STATUS_SUCCESS);
}
static bool is_device_wating_for_connect(const bdaddr_t *addr,
@@ -402,7 +402,7 @@ static gboolean disconnected_cb(GIOChannel *io, GIOCondition cond,
done:
connection_cleanup(dev);
- queue_foreach(dev->clients, disconnect_notify, dev);
+ queue_foreach(dev->clients, client_disconnect_notify, dev);
destroy_device(dev);
return FALSE;
@@ -795,7 +795,7 @@ reply:
* If this is last client, this is still OK to do because on connect
* request we do le scan and wait until remote device start
* advertisement */
- send_disconnect_notify(cmd->client_if, dev, HAL_STATUS_SUCCESS);
+ send_client_disconnect_notify(cmd->client_if, dev, HAL_STATUS_SUCCESS);
/* If there is more clients just return */
if (!queue_isempty(dev->clients))