[Adapt] Fix warnings

Change-Id: I5935fae8f29032df8c08444cf837c235dc7bd83c
Signed-off-by: Anupam Roy <anupam.r@samsung.com>

diff --git a/bt-service-adaptation/services/adapter/bt-service-core-adapter.c b/bt-service-adaptation/services/adapter/bt-service-core-adapter.c
index 9435d15..8b39942 100644 (file)
--- a/bt-service-adaptation/services/adapter/bt-service-core-adapter.c
+++ b/bt-service-adaptation/services/adapter/bt-service-core-adapter.c
@@ -57,8 +57,6 @@
 #include <oal-manager.h>
 #include <oal-adapter-mgr.h>
 
-#define BT_ENABLE_TIMEOUT 20000 /* 20 seconds */
-
 /*This file will contain state machines related to adapter and remote device */
 
 /* Global variables */

diff --git a/bt-service-adaptation/services/bt-request-handler.c b/bt-service-adaptation/services/bt-request-handler.c
index e6ad7bb..fa19723 100644 (file)
--- a/bt-service-adaptation/services/bt-request-handler.c
+++ b/bt-service-adaptation/services/bt-request-handler.c
@@ -1556,13 +1556,13 @@ int __bt_bluez_request(int function_name,
                break;
        }
        case BT_SET_ADVERTISING_DATA: {
-               char *sender = NULL;
+               char *app = NULL;
                int *adv_handle;
                bluetooth_advertising_data_t adv = { {0} };
                int length;
                gboolean use_reserved_slot = FALSE;
 
-               sender = (char *)g_dbus_method_invocation_get_sender(context);
+               app = (char *)g_dbus_method_invocation_get_sender(context);
                adv_handle = g_malloc0(sizeof(int));
 
                 __bt_service_get_parameters(in_param1,
@@ -1573,26 +1573,25 @@ int __bt_bluez_request(int function_name,
                        &length, sizeof(int));
                 __bt_service_get_parameters(in_param4,
                        &use_reserved_slot, sizeof(gboolean));
-               result = _bt_set_advertising_data(sender, *adv_handle,
+               result = _bt_set_advertising_data(app, *adv_handle,
                        &adv, length, use_reserved_slot);
                if (result != BLUETOOTH_ERROR_NONE) {
                        BT_ERR("Set Advertising data failed!!");
                        g_free(adv_handle);
                } else {
-                       sender = (char*)g_dbus_method_invocation_get_sender(context);
-                       _bt_save_invocation_context(context, result, sender,
+                       _bt_save_invocation_context(context, result, app,
                                        function_name, (gpointer)adv_handle);
                }
                break;
        }
        case BT_SET_SCAN_RESPONSE_DATA: {
-                char *sender = NULL;
+                char *app = NULL;
                 int *adv_handle;
                 bluetooth_scan_resp_data_t rsp = { {0} };
                 int length;
                 gboolean use_reserved_slot = FALSE;
 
-                sender = (char *)g_dbus_method_invocation_get_sender(context);
+                app = (char *)g_dbus_method_invocation_get_sender(context);
                adv_handle = g_malloc0(sizeof(int));
 
                 __bt_service_get_parameters(in_param1,
@@ -1604,21 +1603,20 @@ int __bt_bluez_request(int function_name,
                 __bt_service_get_parameters(in_param4,
                                 &use_reserved_slot, sizeof(gboolean));
 
-                result = _bt_set_scan_response_data(sender, *adv_handle,
+                result = _bt_set_scan_response_data(app, *adv_handle,
                                 &rsp, length, use_reserved_slot);
 
                if (result != BLUETOOTH_ERROR_NONE) {
                        BT_ERR("Set Scan Response Data failed!!");
                        g_free(adv_handle);
                } else {
-                       sender = (char*)g_dbus_method_invocation_get_sender(context);
-                       _bt_save_invocation_context(context, result, sender,
+                       _bt_save_invocation_context(context, result, app,
                                        function_name, (gpointer)adv_handle);
                }
                 break;
         }
        case BT_SET_ADVERTISING: {
-                char *sender = NULL;
+                char *app = NULL;
                 int *adv_handle;
                 gboolean enable = FALSE;
                 gboolean use_reserved_slot = FALSE;
@@ -1631,28 +1629,27 @@ int __bt_bluez_request(int function_name,
                 __bt_service_get_parameters(in_param3,
                                 &use_reserved_slot, sizeof(gboolean));
 
-                sender = (char *)g_dbus_method_invocation_get_sender(context);
+                app = (char *)g_dbus_method_invocation_get_sender(context);
 
-                result = _bt_set_advertising(sender, *adv_handle,
+                result = _bt_set_advertising(app, *adv_handle,
                                 enable, use_reserved_slot);
                if (result != BLUETOOTH_ERROR_NONE) {
                        BT_ERR("Start Advertising failed!!");
                        g_free(adv_handle);
                } else {
-                       sender = (char*)g_dbus_method_invocation_get_sender(context);
-                       _bt_save_invocation_context(context, result, sender,
+                       _bt_save_invocation_context(context, result, app,
                                        function_name, (gpointer)adv_handle);
                }
                 break;
         }
         case BT_SET_CUSTOM_ADVERTISING: {
-                char *sender = NULL;
+                char *app = NULL;
                 int *adv_handle;
                 gboolean enable = FALSE;
                 bluetooth_advertising_params_t adv_params;
                 gboolean use_reserved_slot = FALSE;
 
-                sender = (char *)g_dbus_method_invocation_get_sender(context);
+                app = (char *)g_dbus_method_invocation_get_sender(context);
                adv_handle = g_malloc0(sizeof(int));
 
                 __bt_service_get_parameters(in_param1, adv_handle,
@@ -1667,29 +1664,28 @@ int __bt_bluez_request(int function_name,
                 BT_DBG("bluetooth_advertising_params_t [%f %f %d %d]",
                                 adv_params.interval_min, adv_params.interval_max,
                                 adv_params.filter_policy, adv_params.type);
-                result = _bt_set_custom_advertising(sender, *adv_handle,
+                result = _bt_set_custom_advertising(app, *adv_handle,
                                 enable, &adv_params, use_reserved_slot);
                if (result != BLUETOOTH_ERROR_NONE) {
                        BT_ERR("Start Custom Advertising failed!!");
                        g_free(adv_handle);
                } else {
-                       sender = (char*)g_dbus_method_invocation_get_sender(context);
-                       _bt_save_invocation_context(context, result, sender,
+                       _bt_save_invocation_context(context, result, app,
                                        function_name, (gpointer)adv_handle);
                }
                 break;
         }
        case BT_GET_SCAN_RESPONSE_DATA: {
                 bluetooth_scan_resp_data_t rsp = { {0} };
-                char *sender = NULL;
+                char *app = NULL;
                 int length = 0;
                int adv_handle;
-                sender = (char *)g_dbus_method_invocation_get_sender(context);
+                app = (char *)g_dbus_method_invocation_get_sender(context);
 
                 __bt_service_get_parameters(in_param1, &adv_handle,
                                 sizeof(int));
 
-                result = _bt_get_scan_response_data(sender, adv_handle, &rsp, &length);
+                result = _bt_get_scan_response_data(app, adv_handle, &rsp, &length);
                 if (result == BLUETOOTH_ERROR_NONE)
                         g_array_append_vals(*out_param1, rsp.data, length);
 
@@ -1697,15 +1693,15 @@ int __bt_bluez_request(int function_name,
         }
        case BT_GET_ADVERTISING_DATA: {
                 bluetooth_advertising_data_t adv = { {0} };
-                char *sender = NULL;
+                char *app = NULL;
                 int length = 0;
                int adv_handle;
-                sender = (char *)g_dbus_method_invocation_get_sender(context);
+                app = (char *)g_dbus_method_invocation_get_sender(context);
 
                 __bt_service_get_parameters(in_param1, &adv_handle,
                                 sizeof(int));
 
-                result = _bt_get_advertising_data(sender, adv_handle, &adv, &length);
+                result = _bt_get_advertising_data(app, adv_handle, &adv, &length);
                 if (result == BLUETOOTH_ERROR_NONE)
                         g_array_append_vals(*out_param1, adv.data, length);
 

diff --git a/bt-service-adaptation/services/bt-service-event-receiver.c b/bt-service-adaptation/services/bt-service-event-receiver.c
index 5ca1322..9bf884b 100644 (file)
--- a/bt-service-adaptation/services/bt-service-event-receiver.c
+++ b/bt-service-adaptation/services/bt-service-event-receiver.c
@@ -50,7 +50,7 @@ _bt_service_event_handler_callback hdp_cb;
 _bt_service_event_handler_callback avrcp_ctrl_cb;
 _bt_service_event_handler_callback avrcp_cb;
 _bt_service_event_handler_callback adapter_le_cb;
-_bt_service_event_handler_callback gatt_cb;
+_bt_service_event_handler_callback adapter_gatt_cb;
 
 void _bt_service_register_event_handler_callback(
                bt_service_module_t module, _bt_service_event_handler_callback cb)
@@ -106,7 +106,7 @@ void _bt_service_register_event_handler_callback(
                break;
        case BT_GATT_MODULE:
                BT_INFO("Register BT_GATT_MODULE callback");
-               gatt_cb = cb;
+               adapter_gatt_cb = cb;
                break;
        default:
                BT_INFO("Unknown module");
@@ -154,7 +154,7 @@ void _bt_service_unregister_event_handler_callback(bt_service_module_t module)
                break;
        case BT_GATT_MODULE:
                BT_INFO("Un-Register BT_GATT_MODULE callback");
-               gatt_cb = NULL;
+               adapter_gatt_cb = NULL;
                break;
        default:
                BT_INFO("Unknown module");
@@ -300,8 +300,8 @@ static gboolean __bt_handle_oal_events(gpointer data)
        case OAL_EVENT_BLE_MULTI_ADVERTISING_DISABLE:
        case OAL_EVENT_BLE_MULTI_ADVERTISING_SET_INST_DATA:
        case OAL_EVENT_BLE_MULTI_ADVERTISING_UPDATE:
-               if (gatt_cb)
-                       gatt_cb(event_type, event_data);
+               if (adapter_gatt_cb)
+                       adapter_gatt_cb(event_type, event_data);
                if (adapter_le_cb)
                        adapter_le_cb(event_type, event_data);
                break;
@@ -327,4 +327,4 @@ void _bt_service_oal_event_receiver(int event_type, gpointer event_data, gsize l
                oal_event->data = g_memdup(event_data, len);
 
        g_idle_add(__bt_handle_oal_events, oal_event);
-}
\ No newline at end of file
+}

diff --git a/bt-service-adaptation/services/bt-service-gatt.h b/bt-service-adaptation/services/bt-service-gatt.h
deleted file mode 100644 (file)
index b3db770..0000000
--- a/bt-service-adaptation/services/bt-service-gatt.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Bluetooth-frwk
- *
- * Copyright (c) 2016-2017 Samsung Electronics Co., Ltd.
- *
- * Contact: Anupam Roy (anupam.r@samsung.com)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *              http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#ifndef BT_SERVICE_GATT_H_
-#define BT_SERVICE_GATT_H_
-
-#include <glib.h>
-#include <sys/types.h>
-#include "bluetooth-api.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int _bt_gatt_init(void);
-
-void _bt_gatt_deinit(void);
-
-int _bt_get_allocated_server_instance(const char *sender, int adv_handle, gboolean use_reserved_slot);
-
-int _bt_register_server_instance(const char *sender, int adv_handle);
-
-int _bt_unregister_server_instance(const char *sender, int adv_handle);
-
-char* _bt_get_sender_and_handle(int server_instance, int *adv_handle);
-
-int _bt_register_server_instance(const char *sender, int adv_handle);
-
-void _bt_get_adv_handle_from_instance(int server_inst, int *adv_handle);
-
-void _bt_set_new_scan_rsp_data(bluetooth_scan_resp_data_t *scan, int len, int instance);
-
-void _bt_set_new_adv_data(bluetooth_advertising_data_t *adv, int len, int instance);
-
-void _bt_get_previous_adv_data(bluetooth_advertising_data_t *adv, int *len, int instance);
-
-void _bt_get_previous_scan_rsp_data(bluetooth_scan_resp_data_t *scan, int *len, int instance);
-
-int _bt_is_sender_gatt_server_with_no_adv(const char *sender, int adv_handle);
-
-void _bt_check_adv_app_termination(const char *name);
-
-#if 0
-int _bt_gatt_server_register(char *sender);
-
-int _bt_gatt_server_unregister(char *sender);
-
-int _bt_gatt_server_update_multi_adv_info(char *name, int instance_id);
-
-int _bt_gatt_server_connect_remote_client(char *sender,
-                               bluetooth_device_address_t *address, int instance_id);
-
-int _bt_gatt_server_disconnect_remote_client(char *sender,
-                               bluetooth_device_address_t *address,
-                               int instance_id);
-
-int _bt_gatt_server_add_service(char *sender, int service_type,
-                               int num_handles, char *svc_uuid, int instance_id);
-
-int _bt_gatt_server_add_included_service(char *sender, int instance_id,
-                                int service_handle, int included_svc_handle);
-
-int _bt_gatt_server_add_characteristic(char *sender, char *char_uuid,
-                               bluetooth_gatt_server_attribute_params_t *param);
-
-int _bt_gatt_server_add_descriptor(char *sender, char *desc_uuid,
-                               bt_gatt_permission_t *perm, int service_handle, int instance_id);
-
-int _bt_gatt_server_start_service(char *sender, int service_handle, int instance_id);
-
-int _bt_gatt_server_stop_service(char *sender, int service_handle, int instance_id);
-
-int _bt_gatt_server_delete_service(char *sender, int service_handle, int instance_id);
-
-int _bt_gatt_server_send_indication(char *sender, bluetooth_device_address_t *addr, bluetooth_gatt_att_data_t *data,
-                                       bluetooth_gatt_server_indication_params_t *param);
-
-int _bt_gatt_server_send_response(char *sender, bluetooth_gatt_att_data_t *data,
-                                       bluetooth_gatt_server_response_params_t *param);
-
-void _bt_gatt_server_clear_req_info(void);
-
-void _bt_gatt_server_clear_connection_info(void);
-
-bt_product_gatt_permission_t _bt_gatt_convert_attr_permission_to_stack_specific(
-                                        bt_gatt_permission_t perm);
-
-void _bt_check_gatt_server_app_termination(const char *name);
-
-int _bt_gatt_server_get_att_mtu(bluetooth_device_address_t *address, unsigned int *mtu);
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* BT_SERVICE_GATT_H_ */

diff --git a/bt-service-adaptation/services/include/bt-service-gatt.h b/bt-service-adaptation/services/include/bt-service-gatt.h
index 7f7eab4..b3db770 100644 (file)
--- a/bt-service-adaptation/services/include/bt-service-gatt.h
+++ b/bt-service-adaptation/services/include/bt-service-gatt.h
@@ -56,6 +56,8 @@ void _bt_get_previous_scan_rsp_data(bluetooth_scan_resp_data_t *scan, int *len,
 
 int _bt_is_sender_gatt_server_with_no_adv(const char *sender, int adv_handle);
 
+void _bt_check_adv_app_termination(const char *name);
+
 #if 0
 int _bt_gatt_server_register(char *sender);