From e56a4b463b1ed862135a6a5b81f7d5f33b33a588 Mon Sep 17 00:00:00 2001 From: DoHyun Pyun Date: Tue, 29 Nov 2016 16:33:42 +0900 Subject: Fix svace 2.2 issues Change-Id: I342ae1a404bb13afc65ca8d891d1d88fa0477600 Signed-off-by: DoHyun Pyun --- packaging/capi-network-bluetooth.spec | 2 +- src/bluetooth-adapter.c | 64 +++++++---------------------------- src/bluetooth-common.c | 6 ++++ test/bt_unit_test.c | 12 ++++--- 4 files changed, 28 insertions(+), 56 deletions(-) diff --git a/packaging/capi-network-bluetooth.spec b/packaging/capi-network-bluetooth.spec index 502fb68..038b850 100644 --- a/packaging/capi-network-bluetooth.spec +++ b/packaging/capi-network-bluetooth.spec @@ -1,6 +1,6 @@ Name: capi-network-bluetooth Summary: Network Bluetooth Framework -Version: 0.3.2 +Version: 0.3.3 Release: 1 Group: Connectivity/API License: Apache-2.0 diff --git a/src/bluetooth-adapter.c b/src/bluetooth-adapter.c index 12ed188..88662fa 100644 --- a/src/bluetooth-adapter.c +++ b/src/bluetooth-adapter.c @@ -550,18 +550,11 @@ int bt_adapter_set_visibility(bt_adapter_visibility_mode_e visibility_mode, int bt_adapter_set_connectable_changed_cb(bt_adapter_connectable_changed_cb callback, void *user_data) { - int ret = BT_ERROR_NONE; - BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON); BT_CHECK_INIT_STATUS(); BT_CHECK_INPUT_PARAMETER(callback); _bt_set_cb(BT_EVENT_CONNECTABLE_CHANGED_EVENT, callback, user_data); - if (ret != BT_ERROR_NONE) { /* LCOV_EXCL_LINE */ - BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(ret), - ret); /* LCOV_EXCL_LINE */ - } /* LCOV_EXCL_LINE */ - - return ret; + return BT_ERROR_NONE; } int bt_adapter_unset_connectable_changed_cb(void) @@ -809,18 +802,13 @@ int bt_adapter_set_state_changed_cb(bt_adapter_state_changed_cb callback, void *user_data) { BT_DBG(""); - int ret = BT_ERROR_NONE; - BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON); BT_CHECK_INIT_STATUS(); BT_CHECK_INPUT_PARAMETER(callback); + _bt_set_cb(BT_EVENT_STATE_CHANGED, callback, user_data); - if (ret != BT_ERROR_NONE) { /* LCOV_EXCL_LINE */ - BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(ret), - ret); /* LCOV_EXCL_LINE */ - } /* LCOV_EXCL_LINE */ - return ret; + return BT_ERROR_NONE; } /* LCOV_EXCL_START */ @@ -840,53 +828,37 @@ int bt_adapter_le_set_state_changed_cb(bt_adapter_le_state_changed_cb callback, int bt_adapter_set_name_changed_cb(bt_adapter_name_changed_cb callback, void *user_data) { - int ret = BT_ERROR_NONE; - BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON); BT_CHECK_INIT_STATUS(); BT_CHECK_INPUT_PARAMETER(callback); + _bt_set_cb(BT_EVENT_NAME_CHANGED, callback, user_data); - if (ret != BT_ERROR_NONE) { /* LCOV_EXCL_LINE */ - BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(ret), - ret); /* LCOV_EXCL_LINE */ - } /* LCOV_EXCL_LINE */ - return ret; + return BT_ERROR_NONE; } int bt_adapter_set_visibility_mode_changed_cb(bt_adapter_visibility_mode_changed_cb callback, void *user_data) { - int ret = BT_ERROR_NONE; - BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON); BT_CHECK_INIT_STATUS(); BT_CHECK_INPUT_PARAMETER(callback); + _bt_set_cb(BT_EVENT_VISIBILITY_MODE_CHANGED, callback, user_data); - if (ret != BT_ERROR_NONE) { /* LCOV_EXCL_LINE */ - BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(ret), - ret); /* LCOV_EXCL_LINE */ - } /* LCOV_EXCL_LINE */ - return ret; + return BT_ERROR_NONE; } int bt_adapter_set_device_discovery_state_changed_cb(bt_adapter_device_discovery_state_changed_cb callback, void *user_data) { - int ret = BT_ERROR_NONE; - BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON); BT_CHECK_INIT_STATUS(); BT_CHECK_INPUT_PARAMETER(callback); + _bt_set_cb(BT_EVENT_DEVICE_DISCOVERY_STATE_CHANGED, - callback, user_data); - if (ret != BT_ERROR_NONE) { /* LCOV_EXCL_LINE */ - BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(ret), - ret); /* LCOV_EXCL_LINE */ - } /* LCOV_EXCL_LINE */ - return ret; + return BT_ERROR_NONE; } #if !defined(TIZEN_PROFILE_WEARABLE) && !defined(TIZEN_PROFILE_IVI) @@ -944,18 +916,13 @@ int bt_adapter_unset_visibility_mode_changed_cb(void) int bt_adapter_set_visibility_duration_changed_cb(bt_adapter_visibility_duration_changed_cb callback, void *user_data) { - int ret = BT_ERROR_NONE; - BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON); BT_CHECK_INIT_STATUS(); BT_CHECK_INPUT_PARAMETER(callback); + _bt_set_cb(BT_EVENT_VISIBILITY_DURATION_CHANGED, callback, user_data); - if (ret != BT_ERROR_NONE) { /* LCOV_EXCL_LINE */ - BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(ret), - ret); /* LCOV_EXCL_LINE */ - } /* LCOV_EXCL_LINE */ - return ret; + return BT_ERROR_NONE; } int bt_adapter_unset_visibility_duration_changed_cb(void) @@ -1408,19 +1375,14 @@ int bt_adapter_set_manufacturer_data_changed_cb( bt_adapter_manufacturer_data_changed_cb callback, void *user_data) { - int ret = BT_ERROR_NONE; - BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON); BT_CHECK_INIT_STATUS(); BT_CHECK_INPUT_PARAMETER(callback); + _bt_set_cb(BT_EVENT_MANUFACTURER_DATA_CHANGED, callback, user_data); - if (ret != BT_ERROR_NONE) { /* LCOV_EXCL_LINE */ - BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(ret), - ret); /* LCOV_EXCL_LINE */ - } /* LCOV_EXCL_LINE */ - return ret; + return BT_ERROR_NONE; } int bt_adapter_unset_manufacturer_data_changed_cb(void) diff --git a/src/bluetooth-common.c b/src/bluetooth-common.c index 2e9f8cd..790d9c7 100644 --- a/src/bluetooth-common.c +++ b/src/bluetooth-common.c @@ -743,6 +743,9 @@ static bt_gatt_server_read_value_requested_cb __bt_gatt_attribute_get_read_cb( for (l2 = serv->services; l2 != NULL; l2 = l2->next) { bt_gatt_service_s *svc = l2->data; + if (!svc) + return NULL; + if (g_strcmp0(svc->path, svc_path) == 0) { for (l3 = svc->characteristics; l3 != NULL; l3 = l3->next) { bt_gatt_characteristic_s *chr = l3->data; @@ -796,6 +799,9 @@ static bt_gatt_server_write_value_requested_cb __bt_gatt_attribute_get_value_cha for (l2 = serv->services; l2 != NULL; l2 = l2->next) { bt_gatt_service_s *svc = l2->data; + if (!svc) + return NULL; + if (g_strcmp0(svc->path, svc_path) == 0) { for (l3 = svc->characteristics; l3 != NULL; l3 = l3->next) { bt_gatt_characteristic_s *chr = l3->data; diff --git a/test/bt_unit_test.c b/test/bt_unit_test.c index d5fac16..e9c6ad3 100644 --- a/test/bt_unit_test.c +++ b/test/bt_unit_test.c @@ -2214,9 +2214,8 @@ void __bt_gatt_client_print_value(bt_gatt_h h) } TC_PRT("Value : %s", str); - - g_free(str); fail: + g_free(str); g_free(value); } @@ -5298,6 +5297,11 @@ int test_input_callback(void *data) __bt_free_test_param(&g_test_param); } + if (slot_id < 0 || slot_id >= 3) { + TC_PRT("Invalid slot id: %d", slot_id); + break; + } + advertiser = advertiser_list[slot_id]; TC_PRT("advertiser: %p", advertiser); @@ -8341,7 +8345,7 @@ int test_input_callback(void *data) TC_PRT("IPSP : Current role is IPSP Sever !"); /* Sockets Layer Call: send() */ - send(ipsp_server_sock, data, strlen(data) + 1, 0); + n = send(ipsp_server_sock, data, strlen(data) + 1, 0); if (n < 0) TC_PRT("\nIPSP Error : While sending data !"); } else { @@ -8350,7 +8354,7 @@ int test_input_callback(void *data) } else if (role == 1) { if (ipsp_client_sock) { /* Sockets Layer Call: send() */ - send(ipsp_client_sock, data, strlen(data) + 1, 0); + n = send(ipsp_client_sock, data, strlen(data) + 1, 0); if (n < 0) TC_PRT("\nIPSP Error : While sending data !"); } else { -- cgit v1.2.3