Fix static analysis tool warnings

Change-Id: I35071e0f9564961610f5a4e924ab5ae8336ce20f
Signed-off-by: Atul Rai <a.rai@samsung.com>

diff --git a/src/bluetooth-common.c b/src/bluetooth-common.c
index 06e878b..7cf1d62 100644 (file)
--- a/src/bluetooth-common.c
+++ b/src/bluetooth-common.c
@@ -1565,7 +1565,7 @@ static void __bt_event_proxy(int event, bluetooth_event_param_t *param, void *us
                bt_get_message_callback_data *data = bt_event_slot_container[event_index].user_data;
                char *target_file = (char*) data->target_file;
                void *user_data = data->user_data;
-               free(data);
+               g_free(data);
 
                bt_map_client_message_s *res = g_malloc0(sizeof(bt_map_client_message_s));
                res->file_path = target_file;

diff --git a/src/bluetooth-map-client.c b/src/bluetooth-map-client.c
index 450aadd..9cc1cf8 100644 (file)
--- a/src/bluetooth-map-client.c
+++ b/src/bluetooth-map-client.c
@@ -105,7 +105,7 @@ int bt_map_client_create_session(const char* remote_address,
        BT_CHECK_INPUT_PARAMETER(remote_address);
 
        bt_map_client_session_info_s* session =
-               malloc(sizeof(bt_map_client_session_info_s));
+               g_malloc0(sizeof(bt_map_client_session_info_s));
        session->remote_address = strdup(remote_address);
 
        error_code = _bt_get_error_code(bluetooth_map_client_create_session(session));
@@ -113,7 +113,7 @@ int bt_map_client_create_session(const char* remote_address,
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code),
                                error_code);
                free(session->remote_address);
-               free(session);
+               g_free(session);
        } else {
                BT_DBG("Successfully created session");
                *handle = session;
@@ -333,7 +333,7 @@ int bt_map_client_get_message(bt_map_client_session_info_h handle,
 
        bt_map_client_session_info_s* session = (bt_map_client_session_info_s*) handle;
 
-       bt_get_message_callback_data *data = malloc(sizeof(*data));
+       bt_get_message_callback_data *data = g_malloc(sizeof(*data));
        data->target_file = target_file;
        data->user_data = user_data;
 
@@ -351,20 +351,20 @@ int bt_map_client_get_message(bt_map_client_session_info_h handle,
 
 void bt_map_client_list_folders_filter_create(bt_map_client_list_folders_filter_h *filter)
 {
-       (*filter) = malloc(sizeof(bt_map_client_list_folders_filter_s));
+       (*filter) = g_malloc(sizeof(bt_map_client_list_folders_filter_s));
        (*filter)->offset = -1;
        (*filter)->max_count = -1;
 }
 
 void bt_map_client_list_folders_filter_destroy(bt_map_client_list_folders_filter_h *filter)
 {
-       free(*filter);
+       g_free(*filter);
        *filter = NULL;
 }
 
 void bt_map_client_list_messages_filter_create(bt_map_client_list_messages_filter_h *filter)
 {
-       (*filter) = malloc(sizeof(bt_map_client_list_messages_filter_s));
+       (*filter) = g_malloc(sizeof(bt_map_client_list_messages_filter_s));
        (*filter)->offset = -1;
        (*filter)->max_count = -1;
        (*filter)->subject_length = -1;
@@ -380,13 +380,13 @@ void bt_map_client_list_messages_filter_create(bt_map_client_list_messages_filte
 
 void bt_map_client_list_messages_filter_destroy(bt_map_client_list_messages_filter_h *filter)
 {
-       free(*filter);
+       g_free(*filter);
        *filter = NULL;
 }
 
 void bt_map_client_push_message_args_create(bt_map_client_push_message_args_h *args)
 {
-       (*args) = malloc(sizeof(bt_map_client_push_message_args_s));
+       (*args) = g_malloc(sizeof(bt_map_client_push_message_args_s));
        (*args)->is_transparent = -1;
        (*args)->is_retry = -1;
        (*args)->charset =  NULL;
@@ -394,7 +394,7 @@ void bt_map_client_push_message_args_create(bt_map_client_push_message_args_h *a
 
 void bt_map_client_push_message_args_destroy(bt_map_client_push_message_args_h *args)
 {
-       free(*args);
+       g_free(*args);
        *args = NULL;
 }
 /* LCOV_EXCL_STOP */

diff --git a/src/bluetooth-proximity.c b/src/bluetooth-proximity.c
index 7070409..799337d 100644 (file)
--- a/src/bluetooth-proximity.c
+++ b/src/bluetooth-proximity.c
@@ -37,7 +37,7 @@ typedef struct {
 
 typedef struct {
        bt_proximity_reporter_server_s reporter_server;
-       bool services_supported;
+       int services_supported;
        bool connected;
 
        const void *connection_callback;

diff --git a/src/bluetooth-tds.c b/src/bluetooth-tds.c
index 43242ef..4c19921 100644 (file)
--- a/src/bluetooth-tds.c
+++ b/src/bluetooth-tds.c
@@ -310,7 +310,6 @@ int bt_tds_provider_send_activation_resp(char *address, int result, bt_tds_provi
                                &dev_address, tds_provider->tds_handle, result, buf, length));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
-               return error_code;
 
        return error_code;
 }