Fix the svace major issues

Change-Id: Ie98b199946c1b3e66ee7180c4b45b30ed7524930
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

diff --git a/src/bluetooth-common.c b/src/bluetooth-common.c
index 6a5892d4a241c70ec05dfa7a5db6e2aba7842d3f..0cfb1545ed99189b97eb5f5875262b4053c3195d 100644 (file)
--- a/src/bluetooth-common.c
+++ b/src/bluetooth-common.c
@@ -1602,8 +1602,6 @@ static void __bt_event_proxy(int event, bluetooth_event_param_t *param, void *us
                        (bt_map_client_message_item_s*)(messages_struct->message_items),
                        messages_struct->size,
                        bt_event_slot_container[event_index].user_data);
-               if (device_addr != NULL)
-                       free(device_addr);
                break;
 
        case BLUETOOTH_EVENT_MAP_GET_MESSAGE_COMPLETE:
@@ -1611,15 +1609,16 @@ 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;
-               g_free(data);
+               void *map_user_data = data->user_data;
 
                bt_map_client_message_s *res = g_malloc0(sizeof(bt_map_client_message_s));
                res->file_path = target_file;
 
                ((bt_map_client_get_message_cb)bt_event_slot_container[event_index].callback)(
-                       param->result, res, user_data);
+                       param->result, res, map_user_data);
+
                g_free(res);
+               g_free(data);
                break;
 
        case BLUETOOTH_EVENT_MAP_PUSH_MESSAGE_COMPLETE:

diff --git a/src/bluetooth-gatt.c b/src/bluetooth-gatt.c
index 66eb05aee5021981d00a526b899f6c55169e4d95..4c74bedfe1545b7b3b718a715517c947c8054627 100644 (file)
--- a/src/bluetooth-gatt.c
+++ b/src/bluetooth-gatt.c
@@ -3417,7 +3417,7 @@ int bt_gatt_client_write_value(bt_gatt_h gatt_handle,
        return ret;
 }
 
-static const bt_gatt_client_h __find_gatt_client(const char *remote_address)
+static bt_gatt_client_h __find_gatt_client(const char *remote_address)
 {
        GSList *l = NULL;
 

diff --git a/src/bluetooth-otp.c b/src/bluetooth-otp.c
index 4fa02f086b4cb12e41deae625e26ec43f314e564..2dcf1b95363af39547f535c90f54810953732f6d 100644 (file)
--- a/src/bluetooth-otp.c
+++ b/src/bluetooth-otp.c
@@ -1249,13 +1249,15 @@ void _bt_otp_client_read_value_response(int result, char *char_path,
                        BT_INFO("Object ID [%llu]", id);
                        /* TODO: Remove the previous stored object list */
                        if (otp_client_s->curr_op == BT_OTP_OBJECT_DISCOVERY) {
+                               uint8_t write_value[7] = {0x00};
+
                                metadata->id = id;
+
                                otp_client_s->object_id = metadata->id;
                                otp_client_s->object_list = g_slist_append(otp_client_s->object_list, metadata);
+                               write_value[0] = OLCP_NEXT;
 
-                               uint8_t value[7] = {0x00};
-                               value[0] = OLCP_NEXT;
-                               error_code = bluetooth_otp_write_characteristics_value(otp_client_s->otp_olcp_control_point, value, 1);
+                               error_code = bluetooth_otp_write_characteristics_value(otp_client_s->otp_olcp_control_point, write_value, 1);
                                if (error_code != BT_ERROR_NONE) {
                                        BT_ERR("Failed to write control point : %s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
                                        result = error_code;
@@ -1500,13 +1502,16 @@ void _bt_otp_client_indication(int result, bluetooth_otp_resp_info_t *info)
                        break;
                case OACP_READ:
                case OACP_WRITE:
+               {
                        BT_INFO("OACP Read/Write Indication received");
                         bluetooth_device_address_t addr_hex = { {0,} };
                        _bt_convert_address_to_hex(&addr_hex, otp_client_s->remote_address);
+
                        if (otc_connection_status) {
                                BT_INFO("OTC Connected already");
                                break;
                        }
+
                        error_code = bluetooth_otp_connect_otc(&addr_hex);
                        if (error_code != BLUETOOTH_ERROR_NONE) {
                                BT_INFO("OTC Connection Failed %s(0x%08x)",
@@ -1515,6 +1520,7 @@ void _bt_otp_client_indication(int result, bluetooth_otp_resp_info_t *info)
                                goto oacp_done;
                        }
                        break;
+               }
                case OACP_ABORT:
                        break;
                default:

diff --git a/test/bt_unit_test.c b/test/bt_unit_test.c
index 4b9256418acda7e0264ca03cf41aac3991e35ae0..24130231a1e0c2701bc18284e5095031cc2bc94b 100644 (file)
--- a/test/bt_unit_test.c
+++ b/test/bt_unit_test.c
@@ -5469,7 +5469,7 @@ int test_input_callback(void *data)
                }
                case BT_UNIT_TEST_FUNCTION_ADAPTER_SET_REMOTE_OOB_EXT_DATA: {
                        char remote_addr[18];
-                       unsigned char *data[4];
+                       unsigned char *param_data[4];
                        int len[4];
                        int i;
                        char tmp[3];
@@ -5485,30 +5485,30 @@ int test_input_callback(void *data)
 
                        for (i = 0; i < 4; i++) {
                                len[i] = strlen(g_test_param.params[i + 1]) / 2;
-                               data[i] = g_malloc0(len[i]);
+                               param_data[i] = g_malloc0(len[i]);
                        }
 
                        for (i = 0; i < 4; i++) {
                                int j;
 
-                               printf("Data[%d] : ", i);
+                               printf("param_data[%d] : ", i);
                                for (j = 0; j < len[i]; j++) {
                                        g_strlcpy(tmp, g_test_param.params[i + 1] + 2 * j, sizeof(tmp));
                                        val = strtol(tmp, NULL, 16);
-                                       data[i][j] = val;
-                                       printf("%02x", data[i][j]);
+                                       param_data[i][j] = val;
+                                       printf("%02x", param_data[i][j]);
                                }
                                printf("\n");
                        }
 
                        ret = bt_adapter_set_remote_oob_ext_data(remote_addr,
-                                       data[0], data[1], len[0], len[1],
-                                       data[2], data[3], len[2], len[3]);
+                                       param_data[0], param_data[1], len[0], len[1],
+                                       param_data[2], param_data[3], len[2], len[3]);
 
                        __bt_free_test_param(&g_test_param);
 
                        for (i = 0; i < 4; i++)
-                               g_free(data[i]);
+                               g_free(param_data[i]);
 
                        TC_PRT("returns %s\n", __bt_get_error_message(ret));
                        break;
@@ -5634,7 +5634,7 @@ int test_input_callback(void *data)
 
                case BT_UNIT_TEST_FUNCTION_ADAPTER_SET_MANUFACTURER_DATA:
                {
-                       char data[20] = {0x03, 0xFF, 0x01, 0x02};
+                       char param_data[20] = {0x03, 0xFF, 0x01, 0x02};
                        int len = 4;
                        int i = 0;
 
@@ -5642,21 +5642,21 @@ int test_input_callback(void *data)
                                len = 0;
                                for (i = 0; i < (strlen(g_test_param.params[0]) - 1); i += 2) {
                                        if (g_test_param.params[0][i] >= 'A' && g_test_param.params[0][i] <= 'F')
-                                               data[i/2] = (g_test_param.params[0][i] - 'A' + 0X0A) << 4;
+                                               param_data[i/2] = (g_test_param.params[0][i] - 'A' + 0X0A) << 4;
                                        else
-                                               data[i/2] = (g_test_param.params[0][i] - '0') << 4;
+                                               param_data[i/2] = (g_test_param.params[0][i] - '0') << 4;
 
                                        if (g_test_param.params[0][i+1] >= 'A' && g_test_param.params[0][i+1] <= 'F')
-                                               data[i/2] += (g_test_param.params[0][i+1] - 'A' + 0X0A);
+                                               param_data[i/2] += (g_test_param.params[0][i+1] - 'A' + 0X0A);
                                        else
-                                               data[i/2] += (g_test_param.params[0][i+1] - '0');
+                                               param_data[i/2] += (g_test_param.params[0][i+1] - '0');
                                        len++;
                                }
 
                                __bt_free_test_param(&g_test_param);
                        }
 
-                       ret = bt_adapter_set_manufacturer_data(data, len);
+                       ret = bt_adapter_set_manufacturer_data(param_data, len);
 
                        TC_PRT("returns %s\n", __bt_get_error_message(ret));
                        break;
@@ -6201,7 +6201,7 @@ int test_input_callback(void *data)
 
                case BT_UNIT_TEST_FUNCTION_ADAPTER_LE_SET_REMOTE_OOB_EXT_DATA: {
                        char remote_addr[18];
-                       unsigned char *data[2];
+                       unsigned char *param_data[2];
                        int len[2];
                        int i;
                        char tmp[3];
@@ -6218,30 +6218,30 @@ int test_input_callback(void *data)
 
                        for (i = 0; i < 2; i++) {
                                len[i] = strlen(g_test_param.params[i + 1]) / 2;
-                               data[i] = g_malloc0(len[i]);
+                               param_data[i] = g_malloc0(len[i]);
                        }
 
                        for (i = 0; i < 2; i++) {
                                int j;
 
-                               printf("Data[%d] : ", i);
+                               printf("param_data[%d] : ", i);
                                for (j = 0; j < len[i]; j++) {
                                        g_strlcpy(tmp, g_test_param.params[i + 1] + 2 * j, sizeof(tmp));
                                        val = strtol(tmp, NULL, 16);
-                                       data[i][j] = val;
-                                       printf("%02x", data[i][j]);
+                                       param_data[i][j] = val;
+                                       printf("%02x", param_data[i][j]);
                                }
                                printf("\n");
                        }
 
                        ret = bt_adapter_le_set_remote_oob_ext_data(remote_addr,
                                        addr_type,
-                                       data[0], data[1], len[0], len[1]);
+                                       param_data[0], param_data[1], len[0], len[1]);
 
                        __bt_free_test_param(&g_test_param);
 
                        for (i = 0; i < 2; i++)
-                               g_free(data[i]);
+                               g_free(param_data[i]);
 
                        TC_PRT("returns %s\n", __bt_get_error_message(ret));
                        break;
@@ -6316,7 +6316,7 @@ int test_input_callback(void *data)
                case BT_UNIT_TEST_FUNCTION_ADAPTER_LE_REGISTER_SCAN_FILTER_MANUFACTURER_DATA: {
                        bt_scan_filter_h scan_filter = NULL;
                        int manufacturer_id = 117; /* samsung */
-                       char data[] = {0x2, 0x2, 0x2, 0x2};
+                       char param_data[] = {0x2, 0x2, 0x2, 0x2};
                        /* Use "appearance & tx power level" of bt_adapter_le_add_XXX_advertising_data */
 
                        ret = bt_adapter_le_scan_filter_create(&scan_filter);
@@ -6324,7 +6324,7 @@ int test_input_callback(void *data)
                                TC_PRT("failed with [0x%04x]", ret);
 
                        ret = bt_adapter_le_scan_filter_set_manufacturer_data(scan_filter,
-                                               manufacturer_id, data, sizeof(data));
+                                               manufacturer_id, param_data, sizeof(param_data));
                        if (ret != BT_ERROR_NONE)
                                TC_PRT("failed with [0x%04x]", ret);
 
@@ -6755,7 +6755,7 @@ int test_input_callback(void *data)
                        TC_PRT("returns %s\n", __bt_get_error_message(ret));
                        break;
                case BT_UNIT_TEST_FUNCTION_SOCKET_SEND_DATA_CUSTOM_UUID: {
-                       char data[] = "Sending test";
+                       char param_data[] = "Sending test";
 
                        if (g_test_param.param_count > 0) {
                                ret = bt_socket_send_data(custom_client_fd,
@@ -6765,7 +6765,7 @@ int test_input_callback(void *data)
                                __bt_free_test_param(&g_test_param);
                        } else {
                                ret = bt_socket_send_data(custom_client_fd,
-                                       data, sizeof(data));
+                                       param_data, sizeof(param_data));
                        }
 
                        TC_PRT("returns %s\n", __bt_get_error_message(ret));
@@ -9608,7 +9608,7 @@ int test_input_callback(void *data)
                }
                case BT_UNIT_TEST_FUNCTION_IPSP_SEND_IPV6_APP_DATA: {
                        int role = -1, n = 0;
-                       char *data = NULL;
+                       char *param_data = NULL;
 
                        if (g_test_param.param_count < 2) {
                                TC_PRT("IPSP Error : Input IPSP Application's role and data to send first !");
@@ -9616,14 +9616,14 @@ int test_input_callback(void *data)
                        }
 
                        role = atoi(g_test_param.params[0]);
-                       data = g_test_param.params[1];
+                       param_data = g_test_param.params[1];
 
                        if (role == 0) {
                                if (ipsp_server_sock) {
                                        TC_PRT("IPSP : Current role is IPSP Sever !");
 
                                        /* Sockets Layer Call: send() */
-                                       n = send(ipsp_server_sock, data, strlen(data) + 1, 0);
+                                       n = send(ipsp_server_sock, param_data, strlen(param_data) + 1, 0);
                                        if (n < 0)
                                                TC_PRT("\nIPSP Error : While sending data !");
                                } else {
@@ -9632,7 +9632,7 @@ int test_input_callback(void *data)
                        } else if (role == 1) {
                                if (ipsp_client_sock) {
                                        /* Sockets Layer Call: send() */
-                                       n = send(ipsp_client_sock, data, strlen(data) + 1, 0);
+                                       n = send(ipsp_client_sock, param_data, strlen(param_data) + 1, 0);
                                        if (n < 0)
                                                TC_PRT("\nIPSP Error : While sending data !");
                                } else {