From c1d10378355747b58a4168fa4dcd2d9f6f7eab5f Mon Sep 17 00:00:00 2001 From: "jihwan.seo" Date: Mon, 22 Feb 2016 14:33:18 +0900 Subject: [PATCH] removed warning for connectivity abstraction. Change-Id: I188d6c588abb8057a6ab4bac8403a1f6dc060148 Signed-off-by: jihwan.seo Reviewed-on: https://gerrit.iotivity.org/gerrit/5105 Tested-by: jenkins-iotivity Reviewed-by: Jaehong Jo Reviewed-by: Jon A. Cruz --- resource/csdk/connectivity/lib/libcoap-4.1.1/pdu.c | 7 +------ .../connectivity/src/bt_le_adapter/android/calenwmonitor.c | 2 +- .../connectivity/src/bt_le_adapter/android/caleserver.c | 1 + resource/csdk/connectivity/src/canetworkconfigurator.c | 14 +++++++++++++- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/resource/csdk/connectivity/lib/libcoap-4.1.1/pdu.c b/resource/csdk/connectivity/lib/libcoap-4.1.1/pdu.c index 0e174fa..7c5c993 100644 --- a/resource/csdk/connectivity/lib/libcoap-4.1.1/pdu.c +++ b/resource/csdk/connectivity/lib/libcoap-4.1.1/pdu.c @@ -453,14 +453,9 @@ size_t coap_get_opt_header_length(unsigned short key, size_t length) { optDeltaLength = 1; } - else if (COAP_OPTION_FIELD_16_BIT < key && COAP_OPTION_FIELD_32_BIT >= key) - { - optDeltaLength = 2; - } else { - printf("Error : Reserved for the Payload marker for Delta"); - return 0; + optDeltaLength = 2; } size_t optLength = 0; diff --git a/resource/csdk/connectivity/src/bt_le_adapter/android/calenwmonitor.c b/resource/csdk/connectivity/src/bt_le_adapter/android/calenwmonitor.c index ba00403..3b4779b 100644 --- a/resource/csdk/connectivity/src/bt_le_adapter/android/calenwmonitor.c +++ b/resource/csdk/connectivity/src/bt_le_adapter/android/calenwmonitor.c @@ -72,7 +72,7 @@ void CALESetNetStateCallback(CALEDeviceStateChangedCallback callback) CAResult_t CAInitializeLEAdapter(const ca_thread_pool_t threadPool) { OIC_LOG(DEBUG, TAG, "IN"); - + (void)threadPool; OIC_LOG(DEBUG, TAG, "OUT"); return CA_STATUS_OK; } diff --git a/resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.c b/resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.c index 28daef1..756f552 100644 --- a/resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.c +++ b/resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.c @@ -2507,6 +2507,7 @@ CAResult_t CAUpdateCharacteristicsToAllGattClients(const uint8_t *charValue, void CASetLEServerThreadPoolHandle(ca_thread_pool_t handle) { OIC_LOG(INFO, TAG, "CASetLEServerThreadPoolHandle is not support"); + (void)handle; } CAResult_t CALEServerInitMutexVaraibles() diff --git a/resource/csdk/connectivity/src/canetworkconfigurator.c b/resource/csdk/connectivity/src/canetworkconfigurator.c index 35174d8..19a733e 100644 --- a/resource/csdk/connectivity/src/canetworkconfigurator.c +++ b/resource/csdk/connectivity/src/canetworkconfigurator.c @@ -28,10 +28,22 @@ #define TAG "OIC_CA_NW_CONFIG" static u_arraylist_t *g_selectedNetworkList = NULL; -static uint32_t NETWORK_IP = CA_ADAPTER_IP; + +#ifdef EDR_ADAPTER static uint32_t NETWORK_RFCOMM = CA_ADAPTER_RFCOMM_BTEDR; +#endif + +#ifdef LE_ADAPTER static uint32_t NETWORK_GATT = CA_ADAPTER_GATT_BTLE; +#endif + +#ifdef IP_ADAPTER +static uint32_t NETWORK_IP = CA_ADAPTER_IP; +#endif + +#ifdef NFC_ADAPTER static uint32_t NETWORK_NFC = CA_ADAPTER_NFC; +#endif #ifdef RA_ADAPTER static uint32_t NETWORK_RA = CA_ADAPTER_REMOTE_ACCESS; -- 2.7.4