code clean up

[Model] All
[BinType] AP
[Customer] OPEN

[Issue#] N/A
[Request] Internal
[Occurrence Version] N/A

[Problem]
[Cause & Measure]
[Checking Method]

[Team] Convergence BT
[Developer] Injun Yang
[Solution company] Samsung
[Change Type] Specification change

Change-Id: If39a447c4bc75ca4053c6b316743138c0a92fb16

diff --git a/bt-api/bt-event-handler.c b/bt-api/bt-event-handler.c
index df55260..9285a83 100644 (file)
--- a/bt-api/bt-event-handler.c
+++ b/bt-api/bt-event-handler.c
@@ -3853,6 +3853,7 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection,
                _bt_convert_addr_string_to_type(change.device_addr.addr, address_str);
 
                if (_bluetooth_gatt_check_service_change_watcher_address(&change.device_addr) == FALSE) {
+                       BT_INFO("GATT Service changed, but no watcher for %s", address_str);
                        return;
                }
 

diff --git a/bt-api/bt-gatt-client.c b/bt-api/bt-gatt-client.c
index 7bf7bfa..13eea3c 100644 (file)
--- a/bt-api/bt-gatt-client.c
+++ b/bt-api/bt-gatt-client.c
@@ -124,24 +124,16 @@ gboolean _bluetooth_gatt_check_service_change_watcher_address(
 {
        GSList *l;
        char device_address[BT_ADDRESS_STRING_SIZE] = { 0 };
-       char secure_address[BT_ADDRESS_STRING_SIZE] = { 0 };
 
        _bt_convert_addr_type_to_string(device_address,
                        (unsigned char *)device_addr->addr);
 
        for (l = service_monitor_list; l != NULL; l = l->next) {
                char device_address2[BT_ADDRESS_STRING_SIZE] = { 0 };
-               char secure_address2[BT_ADDRESS_STRING_SIZE] = { 0 };
                bluetooth_device_address_t *addr = l->data;
 
                _bt_convert_addr_type_to_string(device_address2,
                                (unsigned char *)addr->addr);
-               _bt_convert_addr_string_to_secure_string(secure_address,
-                               device_address);
-               _bt_convert_addr_string_to_secure_string(secure_address2,
-                               device_address2);
-               BT_INFO("service_monitor_list [%s] - Input [%s]",
-                               secure_address2, secure_address);
 
                if (!memcmp(device_addr, addr,
                            sizeof(bluetooth_device_address_t)))
@@ -1865,7 +1857,7 @@ static void __bt_fill_char_handle_informations(bt_char_browse_info_t *props, bt_
 
        /* Now fill all the char handles [UUID and Instance ID's]*/
        for (count = 0; count < props->count; count++) {
-               BT_INFO("[%d] %s  instance_id [%d] properties [%d]",
+               BT_DBG("[%d] %s  instance_id [%d] properties [%d]",
                                count, props->uuids[count], props->inst_id[count], props->props[count]);
 
                g_strlcpy(service->char_handle.uuids[count],
@@ -1890,7 +1882,7 @@ static void __bt_fill_desc_handle_informations(bt_descriptor_browse_info_t *prop
 
        /* Now fill all the descriptor handles [UUID and Instance ID's]*/
        for (count = 0; count < props->count; count++) {
-               BT_INFO("[%d] %s  instance_id [%d]",
+               BT_DBG("[%d] %s  instance_id [%d]",
                                count, props->uuids[count], props->inst_id[count]);
 
                g_strlcpy(charc->char_desc_handle.uuids[count],

diff --git a/bt-oal/oal-gatt.c b/bt-oal/oal-gatt.c
index 61453d1..45e88fb 100644 (file)
--- a/bt-oal/oal-gatt.c
+++ b/bt-oal/oal-gatt.c
@@ -1647,18 +1647,8 @@ static void cb_gattc_read_characteristic(int conn_id, int status, btgatt_read_pa
                BT_INFO("Charac => [%s], Inst_id [%u]", uuid_str2, p_data->char_id.inst_id);
                BT_DBG("Len: %u, value_type: %u", p_data->value.len, p_data->value_type);
                if (p_data->value.len > 0 && event->value_type == GATTC_READ_VALUE_TYPE_VALUE) {
-                       char *data = NULL;
-                       data = g_malloc(3*p_data->value.len+1);
-                       if (!data) {
-                               BT_ERR("memory allocation failed");
-                               g_free(event);
-                               return;
-                       }
-                       convert_hex_2_str((unsigned char *)p_data->value.value, p_data->value.len, data);
-                       BT_DBG("Read Data: [%s]", data);
                        event->data_len = p_data->value.len;
                        memcpy(&(event->data), &(p_data->value.value), event->data_len);
-                       g_free(data);
                }
        }
        send_event(OAL_EVENT_GATTC_READ_CHARAC, event, sizeof(*event));

diff --git a/bt-service-adaptation/services/bt-request-handler.c b/bt-service-adaptation/services/bt-request-handler.c
index 93f75bb..c2f791a 100644 (file)
--- a/bt-service-adaptation/services/bt-request-handler.c
+++ b/bt-service-adaptation/services/bt-request-handler.c
@@ -248,7 +248,6 @@ void _bt_save_invocation_context(GDBusMethodInvocation *invocation, int result,
                char *sender, int service_function,
                gpointer invocation_data)
 {
-       BT_DBG("Saving the invocation context: service_function [%d]", service_function);
        invocation_info_t *info;
        info = g_malloc0(sizeof(invocation_info_t));
        info->context = invocation;
@@ -375,8 +374,8 @@ static void __bt_service_method(GDBusConnection *connection,
 
                if (request_type == BT_ASYNC_REQ ||
                                __bt_is_sync_function(service_function)) {
-                       BT_DBG("Do not send reply to bt-api over dbus,"
-                               " Invocation context is already saved in service_function");
+                       /* Do not send reply to bt-api over dbus,
+                               Invocation context is already saved in service_function */
                        goto done;
                }
 
@@ -715,7 +714,6 @@ int __bt_bluez_request(int function_name,
                if (result == BLUETOOTH_ERROR_NONE) {
                        char * addr = g_malloc0(BT_ADDRESS_STRING_SIZE);
                        _bt_convert_addr_type_to_string(addr, address.addr);
-                       BT_DBG("_bt_bond_device scheduled successfully! save invocation context");
                        sender = (char*)g_dbus_method_invocation_get_sender(context);
                        _bt_save_invocation_context(context, result, sender,
                                        function_name, (gpointer)addr);
@@ -744,7 +742,6 @@ int __bt_bluez_request(int function_name,
                if (result == BLUETOOTH_ERROR_NONE) {
                        char * addr = g_malloc0(BT_ADDRESS_STRING_SIZE);
                        _bt_convert_addr_type_to_string(addr, address.addr);
-                       BT_DBG("_bt_bond_device_by_type invoked successfully! save invocation context");
                        sender = (char*)g_dbus_method_invocation_get_sender(context);
                        _bt_save_invocation_context(context, result, sender,
                                        function_name, (gpointer)addr);
@@ -770,7 +767,6 @@ int __bt_bluez_request(int function_name,
                if (result == BLUETOOTH_ERROR_NONE) {
                        char * addr = g_malloc0(BT_ADDRESS_STRING_SIZE);
                        _bt_convert_addr_type_to_string(addr, address.addr);
-                       BT_DBG("_bt_unbond_device scheduled successfully! save invocation context");
                        sender = (char*)g_dbus_method_invocation_get_sender(context);
                        _bt_save_invocation_context(context, result, sender,
                                        function_name, (gpointer)addr);
@@ -793,7 +789,6 @@ int __bt_bluez_request(int function_name,
                if (result == BLUETOOTH_ERROR_NONE) {
                        char * addr = g_malloc0(BT_ADDRESS_STRING_SIZE);
                        _bt_convert_addr_type_to_string(addr, address.addr);
-                       BT_DBG("BT Device Service Search Request scheduled successfully! save invocation context");
                        sender = (char*)g_dbus_method_invocation_get_sender(context);
                        _bt_save_invocation_context(context, result, sender,
                                        function_name, (gpointer)addr);
@@ -1422,7 +1417,6 @@ int __bt_bluez_request(int function_name,
                                        sizeof(bluetooth_rfcomm_connection_t));
                } else {
                        char *addr = g_malloc0(BT_ADDRESS_STRING_SIZE);
-                       BT_ERR("BT_RFCOMM_CLIENT_CONNECT success, save context");
                        _bt_convert_addr_type_to_string(addr, address.addr);
                        sender = (char*)g_dbus_method_invocation_get_sender(context);
                        _bt_save_invocation_context(context, result, sender, function_name, addr);
@@ -1462,8 +1456,6 @@ int __bt_bluez_request(int function_name,
 
                result = _bt_rfcomm_socket_listen(sender, uuid, true);
                if (result > 0) {
-                       BT_ERR("BT_RFCOMM_LISTEN_AND_ACCEPT success, save context");
-
                        result = BLUETOOTH_ERROR_NONE;
                        _bt_save_invocation_context(context,
                                        result, sender, function_name, NULL);
@@ -1481,8 +1473,6 @@ int __bt_bluez_request(int function_name,
 
                result = _bt_rfcomm_socket_listen(sender, uuid, false);
                if (result > 0) {
-                       BT_ERR("BT_RFCOMM_LISTEN success, save context");
-
                        result = BLUETOOTH_ERROR_NONE;
                        _bt_save_invocation_context(context,
                                        result, sender, function_name, NULL);
@@ -2332,14 +2322,13 @@ int __bt_bluez_request(int function_name,
                char *app;
 
                app = (char *)g_dbus_method_invocation_get_sender(context);
-               BT_INFO("GATT Server Unique Name [%s]", app);
+               BT_DBG("GATT Server Unique Name [%s]", app);
 
                /* No ADV handle: Set 0 */
                result = _bt_register_server_instance(app, 0);
-               BT_INFO("GATT Server: Register Server result [%d]", result);
 
                if (result != BLUETOOTH_ERROR_NONE) {
-                       BT_ERR("GATT Server registration failed!!");
+                       BT_ERR("GATT Server registration failed. result %d", result);
                } else {
                        _bt_save_invocation_context(context, result, app,
                                        function_name, NULL);
@@ -2372,15 +2361,12 @@ int __bt_bluez_request(int function_name,
                __bt_service_get_parameters(in_param4, &instance_id,
                                sizeof(int));
 
-               BT_INFO("GATT Server Service UUID [%s]", svc_uuid);
                result = _bt_gatt_server_add_service(app, service_type, num_handles, svc_uuid, instance_id);
                if (result != BLUETOOTH_ERROR_NONE) {
                        BT_ERR("GATT Server Add Service failed!!");
                } else {
                        tmp_inst_id = g_malloc0(sizeof(int));
                        *tmp_inst_id = instance_id;
-                       BT_INFO("GATT Server: Save Instance ID in request Inst id [%d] request_id [%d]",
-                                       *tmp_inst_id, instance_id);
                        _bt_save_invocation_context(context, result, app,
                                        function_name, (gpointer)tmp_inst_id);
                }
@@ -2400,16 +2386,13 @@ int __bt_bluez_request(int function_name,
                                sizeof(bluetooth_gatt_server_attribute_params_t));
                char_uuid = (char *)g_variant_get_data(in_param2);
 
-               BT_INFO("GATT Server Characteristic UUID [%s]", char_uuid);
-
                result = _bt_gatt_server_add_characteristic(app, char_uuid, &param);
                if (result != BLUETOOTH_ERROR_NONE) {
                        BT_ERR("GATT Server Add Service failed!!");
                } else {
                        tmp_inst_id = g_malloc0(sizeof(int));
                        *tmp_inst_id = param.instance_id;
-                       BT_INFO("GATT Server: Save Instance ID in request Inst id [%d] request_id [%d]",
-                                       *tmp_inst_id, param.instance_id);
+
                        _bt_save_invocation_context(context, result, app,
                                        function_name, (gpointer)tmp_inst_id);
                }
@@ -2435,16 +2418,12 @@ int __bt_bluez_request(int function_name,
                __bt_service_get_parameters(in_param3, &perm,
                                sizeof(bt_gatt_permission_t));
 
-               BT_INFO("GATT Server Descriptor UUID [%s]", desc_uuid);
-
                result = _bt_gatt_server_add_descriptor(app, desc_uuid, &perm, service_handle, instance_id);
                if (result != BLUETOOTH_ERROR_NONE) {
                        BT_ERR("GATT Server Add Service failed!!");
                } else {
                        tmp_inst_id = g_malloc0(sizeof(int));
                        *tmp_inst_id = instance_id;
-                       BT_INFO("GATT Server: Save Instance ID in request Inst id [%d] request_id [%d]",
-                                       *tmp_inst_id, instance_id);
                        _bt_save_invocation_context(context, result, app,
                                        function_name, (gpointer)tmp_inst_id);
                }
@@ -2468,8 +2447,6 @@ int __bt_bluez_request(int function_name,
                if (BLUETOOTH_ERROR_NONE == result) {
                        tmp_inst_id = g_malloc0(sizeof(int));
                        *tmp_inst_id = instance_id;
-                       BT_INFO("GATT Server: Save Instance ID in request Inst id [%d] request_id [%d]",
-                                       *tmp_inst_id, instance_id);
                        _bt_save_invocation_context(context, result, app,
                                        function_name, (gpointer)tmp_inst_id);
                }
@@ -2492,8 +2469,6 @@ int __bt_bluez_request(int function_name,
                if (BLUETOOTH_ERROR_NONE == result) {
                        tmp_inst_id = g_malloc0(sizeof(int));
                        *tmp_inst_id = instance_id;
-                       BT_INFO("GATT Server: Save Instance ID in request Inst id [%d] request_id [%d]",
-                                       *tmp_inst_id, instance_id);
                        _bt_save_invocation_context(context, result, app,
                                        function_name, (gpointer)tmp_inst_id);
                }
@@ -2516,8 +2491,6 @@ int __bt_bluez_request(int function_name,
                if (BLUETOOTH_ERROR_NONE == result) {
                        tmp_inst_id = g_malloc0(sizeof(int));
                        *tmp_inst_id = instance_id;
-                       BT_INFO("GATT Server: Save Instance ID in request Inst id [%d] request_id [%d]",
-                                       *tmp_inst_id, instance_id);
                        _bt_save_invocation_context(context, result, app,
                                        function_name, (gpointer)tmp_inst_id);
                }
@@ -2678,7 +2651,6 @@ int __bt_bluez_request(int function_name,
                result = _bt_request_att_mtu(&address, mtu);
                if (BLUETOOTH_ERROR_NONE == result) {
                        addr = g_malloc0(BT_ADDRESS_STRING_SIZE);
-                       BT_INFO("GATT Client: Save Invocation data for BT_REQ_ATT_MTU [%s]", sender);
 
                        _bt_convert_addr_type_to_string(addr, address.addr);
 
@@ -2732,7 +2704,6 @@ int __bt_bluez_request(int function_name,
                        addr = g_malloc0(BT_ADDRESS_STRING_SIZE);
 
                        _bt_convert_addr_type_to_string(addr, address.addr);
-                       BT_INFO("GATT Client: Save Invocation data GATT CLient Register app[%s] address [%s]", sender, addr);
 
                        /* Save the informations to invocation */
                        _bt_save_invocation_context(context, result, sender,
@@ -2844,7 +2815,6 @@ int __bt_bluez_request(int function_name,
                result = _bt_disconnect_le_device(&address, client_id);
                if (BLUETOOTH_ERROR_NONE == result) {
                        addr = g_malloc0(BT_ADDRESS_STRING_SIZE);
-                       BT_INFO("GATT Client: Save Invocation data DisConnect LE app[%s]", sender);
 
                        _bt_convert_addr_type_to_string(addr, address.addr);
 
@@ -2871,8 +2841,6 @@ int __bt_bluez_request(int function_name,
 
                result = _bt_gatt_get_primary_services(addr);
                if (BLUETOOTH_ERROR_NONE == result) {
-                       BT_INFO("GATT Client: Save Remote GATT Server address addr [%s] app[%s]",
-                                       addr, sender);
                        _bt_save_invocation_context(context, result, sender,
                                        function_name, (gpointer)addr);
                } else
@@ -2891,8 +2859,6 @@ int __bt_bluez_request(int function_name,
 
                result = _bt_gatt_get_all_characteristic(&param);
                if (BLUETOOTH_ERROR_NONE == result) {
-                       BT_INFO("GATT Client: Save Invocation data for Service props app[%s]", sender);
-
                        /* Save the informations to invocation */
                        _bt_save_invocation_context(context, result, sender,
                                        function_name,
@@ -2911,8 +2877,6 @@ int __bt_bluez_request(int function_name,
 
                result = _bt_gatt_get_all_characteristic_properties(&param);
                if (BLUETOOTH_ERROR_NONE == result) {
-                       BT_INFO("GATT Client: Save Invocation data for characteristic props app[%s]", sender);
-
                        /* Save the informations to invocation */
                        _bt_save_invocation_context(context, result, sender,
                                        function_name,
@@ -2932,8 +2896,6 @@ int __bt_bluez_request(int function_name,
 
                result = _bt_gatt_read_characteristic_value(&param);
                if (BLUETOOTH_ERROR_NONE == result) {
-                       BT_INFO("GATT Client: Save Invocation data for characteristic props app[%s]", sender);
-
                        /* Save the informations to invocation */
                        _bt_save_invocation_context(context, result, sender,
                                        function_name,
@@ -2953,8 +2915,6 @@ int __bt_bluez_request(int function_name,
 
                result = _bt_gatt_read_descriptor_value(&param);
                if (BLUETOOTH_ERROR_NONE == result) {
-                       BT_INFO("GATT Client: Save Invocation data for Descriptor's props app[%s]", sender);
-
                        /* Save the informations to invocation */
                        _bt_save_invocation_context(context, result, sender,
                                        function_name,
@@ -2982,8 +2942,6 @@ int __bt_bluez_request(int function_name,
 
                result = _bt_gatt_write_characteristic_value_by_type(&param , &data, write_type);
                if (BLUETOOTH_ERROR_NONE == result) {
-                       BT_INFO("GATT Client: Save Invocation data for characteristic props app[%s]", sender);
-
                        /* Save the informations to invocation */
                        _bt_save_invocation_context(context, result, sender,
                                        function_name,
@@ -3010,8 +2968,6 @@ int __bt_bluez_request(int function_name,
 
                result = _bt_gatt_write_descriptor_value_by_type(&param, &data, write_type);
                if (BLUETOOTH_ERROR_NONE == result) {
-                       BT_INFO("GATT Client: Save Invocation data for descriptor props app[%s]", sender);
-
                        /* Save the informations to invocation */
                        _bt_save_invocation_context(context, result, sender,
                                        function_name,
@@ -3049,7 +3005,7 @@ int __bt_bluez_request(int function_name,
                if (is_indicate == false) {
                        result   = _bt_gatt_acquire_notify(&param , &fd, &mtu);
                        if (BLUETOOTH_ERROR_NONE == result && fd > -1) {
-                               BT_INFO("GATT Client: Save Invocation data for characteristic props app[%s] fd[ %d]", sender, fd);
+                               BT_DBG("GATT Client: Save Invocation data for characteristic props app[%s] fd[ %d]", sender, fd);
 
                                GUnixFDList *fd_list = NULL;
                                GError *error = NULL;
@@ -3071,8 +3027,6 @@ int __bt_bluez_request(int function_name,
 normal:
                        result = _bt_gatt_watch_characteristic(&param , client_id, is_notify);
                        if (BLUETOOTH_ERROR_NONE == result) {
-                               BT_INFO("GATT Client: Save Invocation data for characteristic props app[%s]", sender);
-
                                /* Save the informations to invocation */
                                _bt_save_invocation_context(context, result, sender, function_name,
                                         (gpointer)g_memdup(&param, sizeof(bluetooth_gatt_client_char_prop_info_t)));

diff --git a/bt-service-adaptation/services/gatt/bt-service-gatt.c b/bt-service-adaptation/services/gatt/bt-service-gatt.c
index 0ed94be..3067535 100644 (file)
--- a/bt-service-adaptation/services/gatt/bt-service-gatt.c
+++ b/bt-service-adaptation/services/gatt/bt-service-gatt.c
@@ -846,13 +846,13 @@ int _bt_register_server_instance(const char *sender, int adv_handle)
        int k;
        oal_uuid_t uuid;
 
-       BT_INFO("###Check on which instance Server instance can be initialized....");
+       BT_INFO("Check on which instance Server instance can be initialized....");
        for (k = 1; k < MAX_APPS_SUPPORTED; k++) {
                if (numapps[k].is_initialized == 1) {
-                       BT_INFO("Instance ID [%d] is already in use..Check next slot", numapps[k].instance_id);
+                       BT_DBG("Instance ID [%d] is already in use..Check next slot", numapps[k].instance_id);
                } else {
                        slot = k;
-                       BT_INFO("Time to register GATT Server..UUID to be used is [%s] slot [%d]", uuid_list[slot-1], slot);
+                       BT_DBG("Time to register GATT Server..UUID to be used is [%s] slot [%d]", uuid_list[slot-1], slot);
                        break;
                }
        }
@@ -874,7 +874,7 @@ int _bt_register_server_instance(const char *sender, int adv_handle)
                g_free(uuid_string);
                return BLUETOOTH_ERROR_INTERNAL;
        }
-       BT_INFO("GATT Server registration call successfully accepted by OAL..wait for Instance Initialized event from OAL..");
+       BT_DBG("GATT Server registration call successfully accepted by OAL..wait for Instance Initialized event from OAL..");
        /* Return & wait for GATT Server Instance Initialization event */
        memset(numapps[slot].sender, 0x00, sizeof(numapps[slot].sender));
        memset(numapps[slot].uuid, 0x00, sizeof(numapps[slot].uuid));
@@ -908,7 +908,7 @@ static void __bt_gatt_handle_pending_request_info(int result,
 #ifndef GATT_DIRECT
                case BT_GATT_SERVER_REGISTER: {
                        bt_service_app_info_t *param = (bt_service_app_info_t*)data;
-                       BT_DBG("Sender [%s] Request Sender [%s]", param->sender, req_info->sender);
+
                        if (!g_strcmp0(req_info->sender, param->sender)) {
                                BT_DBG("GATT Server app found [%s]", req_info->sender);
 
@@ -925,7 +925,6 @@ static void __bt_gatt_handle_pending_request_info(int result,
                case BT_GATT_SERVER_START_SERVICE:
                case BT_GATT_SERVER_DELETE_SERVICE: {
                        bt_service_app_info_t *param = (bt_service_app_info_t*)data;
-                       BT_DBG("Sender [%s] Request Sender [%s]", param->sender, req_info->sender);
 
                        int *saved_instance_id = (int*)req_info->user_data;
                        if (!g_strcmp0(req_info->sender, param->sender) && param->instance_id == *saved_instance_id) {
@@ -995,7 +994,7 @@ static void __bt_gatt_handle_pending_request_info(int result,
 #ifdef TIZEN_GATT_CLIENT
                case BT_GATT_CLIENT_REGISTER: {
                        bt_service_app_info_t *param = (bt_service_app_info_t*)data;
-                       BT_DBG("Sender [%s] Request Sender [%s]", param->sender, req_info->sender);
+
                        if (!g_strcmp0(req_info->sender, param->sender)) {
                                BT_DBG("GATT Client app found [%s] created client ID [%d]",
                                                req_info->sender, param->client_id);
@@ -1016,8 +1015,6 @@ static void __bt_gatt_handle_pending_request_info(int result,
                        _bt_convert_addr_type_to_string(address,
                                        (unsigned char *)(&param->device_addr.addr));
 
-                       BT_DBG("Request Sender [%s] address [%s]", req_info->sender, address);
-
                        /* Match address to determine same request */
                        if (!g_strcmp0((char*)req_info->user_data, address)) {
                                BT_DBG("GATT Client app found [%s] Remote address [%s]",
@@ -1041,7 +1038,7 @@ static void __bt_gatt_handle_pending_request_info(int result,
                        bt_char_browse_info_t param;
                        memcpy((void*)&param, data, sizeof(bt_char_browse_info_t));
                        //bt_char_browse_info_t *param = (bt_char_browse_info_t*)data;
-                       BT_DBG("Request Sender [%s]", req_info->sender);
+
                        bluetooth_gatt_client_svc_prop_info_t *prop = (bluetooth_gatt_client_svc_prop_info_t*)req_info->user_data;
 
                        /* Match both address and service properties to determine same request */
@@ -1065,7 +1062,6 @@ static void __bt_gatt_handle_pending_request_info(int result,
                case BT_GATT_GET_CHARACTERISTIC_PROPERTIES: {
                        bt_descriptor_browse_info_t *param = (bt_descriptor_browse_info_t*)data;
 
-                       BT_DBG("Request Sender [%s]", req_info->sender);
                        bluetooth_gatt_client_char_prop_info_t *prop = (bluetooth_gatt_client_char_prop_info_t*)req_info->user_data;
 
                        /* Match both address, service properties &char properties to determine same request */
@@ -1090,7 +1086,7 @@ static void __bt_gatt_handle_pending_request_info(int result,
                case BT_GATT_WATCH_CHARACTERISTIC: {
                        bt_gatt_notif_reg_info_t *param = (bt_gatt_notif_reg_info_t*)data;
                        bluetooth_gatt_client_char_prop_info_t *prop = (bluetooth_gatt_client_char_prop_info_t*)req_info->user_data;
-                       BT_DBG("Request Sender [%s]", req_info->sender);
+
                        /* Match both address, service properties &char properties to determine same request */
                        if (!memcmp(param->addr.addr,
                                        prop->device_address.addr,
@@ -1113,7 +1109,6 @@ static void __bt_gatt_handle_pending_request_info(int result,
                case BT_GATT_READ_CHARACTERISTIC:
                case BT_GATT_WRITE_CHARACTERISTIC_VALUE_BY_TYPE: {
                         bluetooth_gatt_client_char_prop_info_t *param = (bluetooth_gatt_client_char_prop_info_t*)data;
-                        BT_DBG("Request Sender [%s]", req_info->sender);
 
                         char *addr = g_malloc0(sizeof(char) * BT_ADDRESS_STRING_SIZE);
                         bluetooth_gatt_client_char_prop_info_t *prop = (bluetooth_gatt_client_char_prop_info_t*)req_info->user_data;
@@ -1135,7 +1130,6 @@ static void __bt_gatt_handle_pending_request_info(int result,
                case BT_GATT_READ_DESCRIPTOR_VALUE:
                case BT_GATT_WRITE_DESCRIPTOR_VALUE: {
                         bluetooth_gatt_client_desc_prop_info_t *param = (bluetooth_gatt_client_desc_prop_info_t*)data;
-                        BT_DBG("Request Sender [%s]", req_info->sender);
 
                         char *addr = g_malloc0(sizeof(char) * BT_ADDRESS_STRING_SIZE);
                         bluetooth_gatt_client_desc_prop_info_t *prop = (bluetooth_gatt_client_desc_prop_info_t*)req_info->user_data;
@@ -3045,7 +3039,7 @@ int _bt_register_gatt_client_instance(const char *sender,
        oal_uuid_t uuid;
 
        /* App should ensure that it should not send */
-       BT_INFO("### Check on which instance GATT Client instance can be initialized....");
+       BT_INFO("Check on which instance GATT Client instance can be initialized....");
        for (k = 1; k < MAX_APPS_SUPPORTED; k++) {
                if (numapps[k].is_initialized == 1) {
                        BT_INFO("Instance ID [%d] is already in use..Check next slot",