From 0a77656ce06ca3ec7423b2cccf3035dbccaeb97b Mon Sep 17 00:00:00 2001 From: DoHyun Pyun Date: Fri, 1 Feb 2019 09:26:01 +0900 Subject: [PATCH] Fix the warning errors Change-Id: Ib1bb16613a744e730a724de0556fbe69e3a72468 Signed-off-by: DoHyun Pyun --- bt-oal/bluez_hal/src/bt-hal-dbus-common-utils.c | 2 +- bt-oal/bluez_hal/src/bt-hal-gatt-client.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/bt-oal/bluez_hal/src/bt-hal-dbus-common-utils.c b/bt-oal/bluez_hal/src/bt-hal-dbus-common-utils.c index 6ab321b..8528369 100644 --- a/bt-oal/bluez_hal/src/bt-hal-dbus-common-utils.c +++ b/bt-oal/bluez_hal/src/bt-hal-dbus-common-utils.c @@ -521,7 +521,7 @@ GDBusProxy *_bt_hal_get_avrcp_ctrl_proxy(bt_bdaddr_t *bd_addr) for (i = 0; i < BT_AUDIO_SOURCE_MAX; i++) { if (proxy_array[i].avrcp_ctrl_proxy && (!memcmp(proxy_array[i].bd_addr.address, bd_addr->address, 6))) { - char *path = g_dbus_proxy_get_object_path(proxy_array[i].avrcp_ctrl_proxy); + const gchar *path = g_dbus_proxy_get_object_path(proxy_array[i].avrcp_ctrl_proxy); if (!path) { proxy_array[i].avrcp_ctrl_proxy = NULL; diff --git a/bt-oal/bluez_hal/src/bt-hal-gatt-client.c b/bt-oal/bluez_hal/src/bt-hal-gatt-client.c index 6f3daca..6895eb0 100644 --- a/bt-oal/bluez_hal/src/bt-hal-gatt-client.c +++ b/bt-oal/bluez_hal/src/bt-hal-gatt-client.c @@ -480,13 +480,6 @@ bt_status_t _hal_gattc_disconnect(int client_if, const bt_bdaddr_t *bd_addr, NULL, (GAsyncReadyCallback)__le_disconnection_req_cb, gattc_data); return ret; -fail: - if (device_proxy) - g_object_unref(device_proxy); - - g_free(gattc_data); - - return ret; } /** Disconnect a remote device or cancel a pending connection */ @@ -2992,14 +2985,6 @@ static bt_status_t __bt_connect_le_device_internal(int client_if, const bt_bdadd (GAsyncReadyCallback)__le_connection_req_cb, gattc_data); return ret; - -fail: - if (device_proxy) - g_object_unref(device_proxy); - - g_free(gattc_data); - - return ret; } static bt_status_t _bt_hold_current_advertising() -- 2.7.4