From 88a306f0ff860140e9924675550ed0aa0c2237ff Mon Sep 17 00:00:00 2001 From: "jihwan.seo" Date: Wed, 8 Jun 2016 13:04:41 +0900 Subject: [PATCH] removed svace warning for android - initialize some variables - adjusted code style - modified unreached code Change-Id: Id0001f98d49b09131f4a4177400bdc6defa51a2f Signed-off-by: jihwan.seo Reviewed-on: https://gerrit.iotivity.org/gerrit/8551 Tested-by: jenkins-iotivity Reviewed-by: Jon A. Cruz --- android/android_api/base/jni/JniCaInterface.c | 4 +-- .../connectivity/common/src/camutex_pthreads.c | 6 ++-- .../src/bt_edr_adapter/android/caedrclient.c | 16 ++++----- .../src/bt_edr_adapter/android/caedrserver.c | 10 +++--- .../src/bt_le_adapter/android/caleclient.c | 40 ++++++++++++---------- .../src/bt_le_adapter/android/calenwmonitor.c | 2 +- .../src/bt_le_adapter/android/caleserver.c | 18 +++++----- .../csdk/connectivity/src/cablockwisetransfer.c | 2 +- .../csdk/connectivity/src/cainterfacecontroller.c | 3 +- resource/csdk/connectivity/src/camessagehandler.c | 10 +++--- resource/csdk/connectivity/src/caprotocolmessage.c | 12 +++---- .../src/ip_adapter/android/caipnwmonitor.c | 7 ++-- .../csdk/connectivity/src/ip_adapter/caipserver.c | 2 +- .../src/nfc_adapter/android/canfcserver.c | 6 ++-- .../csdk/connectivity/test/cablocktransfertest.cpp | 3 +- .../util/src/btpairing/android/cabtpairing.c | 2 +- .../src/camanager/android/caleconnectionmanager.c | 4 +-- 17 files changed, 74 insertions(+), 73 deletions(-) diff --git a/android/android_api/base/jni/JniCaInterface.c b/android/android_api/base/jni/JniCaInterface.c index 81fcd81..e8649ec 100644 --- a/android/android_api/base/jni/JniCaInterface.c +++ b/android/android_api/base/jni/JniCaInterface.c @@ -74,7 +74,7 @@ void CAManagerConnectionStateChangedCB(CATransportAdapter_t adapter, } bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -155,7 +155,7 @@ void CAManagerAdapterStateChangedCB(CATransportAdapter_t adapter, bool enabled) } bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { diff --git a/resource/csdk/connectivity/common/src/camutex_pthreads.c b/resource/csdk/connectivity/common/src/camutex_pthreads.c index 834886c..6d866ad 100644 --- a/resource/csdk/connectivity/common/src/camutex_pthreads.c +++ b/resource/csdk/connectivity/common/src/camutex_pthreads.c @@ -189,7 +189,8 @@ ca_cond ca_cond_new(void) #if defined(__ANDROID__) || _POSIX_TIMERS > 0 #ifdef __ANDROID__ - if (camutex_condattr_setclock) { + if (camutex_condattr_setclock) + { ret = camutex_condattr_setclock(&(eventInfo->condattr), CLOCK_MONOTONIC); #else { @@ -334,7 +335,8 @@ CAWaitResult_t ca_cond_wait_for(ca_cond cond, ca_mutex mutex, uint64_t microseco struct timespec abstime; #ifdef __ANDROID__ - if (camutex_cond_timedwait_relative) { + if (camutex_cond_timedwait_relative) + { abstime.tv_sec = microseconds / USECS_PER_SEC; abstime.tv_nsec = (microseconds % USECS_PER_SEC) * NANOSECS_PER_USECS; //Wait for the given time diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrclient.c b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrclient.c index bdcc44e..6a674ae 100644 --- a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrclient.c +++ b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrclient.c @@ -210,7 +210,7 @@ CAResult_t CAEDRGetAdapterEnableState(bool *state) return CA_STATUS_INVALID_PARAM; } bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -249,7 +249,7 @@ void CAEDRJniInitContext() CAResult_t CAEDRCreateJNIInterfaceObject(jobject context) { - JNIEnv* env; + JNIEnv* env = NULL; OIC_LOG(DEBUG, TAG, "CAEDRCreateJNIInterfaceObject"); if ((*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6) != JNI_OK) @@ -353,7 +353,7 @@ CAResult_t CAEDRInitialize() } bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -404,7 +404,7 @@ void CAEDRTerminate() OIC_LOG(DEBUG, TAG, "CAEDRTerminate"); bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -451,7 +451,7 @@ CAResult_t CAEDRDestroyJniInterface() } bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -531,7 +531,7 @@ CAResult_t CAEDRSendMulticastMessage(const uint8_t* data, uint32_t dataLen) VERIFY_NON_NULL(data, TAG, "data is null"); bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -572,7 +572,7 @@ CAResult_t CAEDRGetInterfaceInfo(char **address) void CAEDRGetLocalAddress(char **address) { bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -619,7 +619,7 @@ CAResult_t CAEDRSendUnicastMessageImpl(const char* address, const uint8_t* data, VERIFY_NON_NULL(data, TAG, "data is null"); bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.c b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.c index 3d4dcb6..b1cf8a0 100644 --- a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.c +++ b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.c @@ -118,7 +118,7 @@ static void CAReceiveHandler(void *data) VERIFY_NON_NULL_VOID(data, TAG, "Invalid thread context"); bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -172,7 +172,7 @@ static void CAAcceptHandler(void *data) VERIFY_NON_NULL_VOID(data, TAG, "data is null"); bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -282,7 +282,7 @@ CAResult_t CAEDRServerStop() } bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -413,7 +413,7 @@ CAResult_t CAEDRServerInitialize(ca_thread_pool_t handle) CAResult_t CAEDRServerStartAcceptThread() { bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -477,7 +477,7 @@ void CAEDRServerTerminate() return; } bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { diff --git a/resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.c b/resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.c index 199f884..4c8df7d 100644 --- a/resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.c +++ b/resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.c @@ -301,7 +301,7 @@ CAResult_t CALECreateJniInterfaceObject() } bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -382,7 +382,7 @@ CAResult_t CALEClientInitialize() } bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -481,7 +481,7 @@ void CALEClientTerminate() } bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -577,7 +577,7 @@ CAResult_t CALEClientDestroyJniInterface() } bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -677,7 +677,7 @@ CAResult_t CALEClientSendMulticastMessage(const uint8_t* data, } bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -842,7 +842,7 @@ CAResult_t CALEClientSendUnicastMessageImpl(const char* address, const uint8_t* } bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -970,11 +970,12 @@ CAResult_t CALEClientSendUnicastMessageImpl(const char* address, const uint8_t* } // reset send state - ret = CALEClientUpdateDeviceState(address, CA_LE_SEND_STATE, - STATE_SEND_NONE); - if (CA_STATUS_OK != ret) + CAResult_t resetRet = CALEClientUpdateDeviceState(address, CA_LE_SEND_STATE, + STATE_SEND_NONE); + if (CA_STATUS_OK != resetRet) { - OIC_LOG(ERROR, TAG, "CALEClientUpdateDeviceState has failed"); + OIC_LOG_V(ERROR, TAG, "CALEClientUpdateDeviceState has failed (%d)", resetRet); + ret = CA_SEND_FAILED; } return ret; @@ -1298,7 +1299,7 @@ CAResult_t CALEClientStartScan() } bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -1526,7 +1527,7 @@ CAResult_t CALEClientStopScan() } bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -2124,7 +2125,7 @@ static void CALEWriteCharacteristicThread(void* object) VERIFY_NON_NULL_VOID(object, TAG, "object is null"); bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -2585,7 +2586,7 @@ CAResult_t CALEClientCreateUUIDList() } bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -4005,7 +4006,7 @@ void CAStopLEGattClient() } bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -4233,13 +4234,14 @@ Java_org_iotivity_ca_CaLeClientInterface_caLeGattConnectionStateChangeCallback(J } OIC_LOG_V(DEBUG, TAG, "CALeGattConnectionStateChangeCallback - address [%s]", address); - CAResult_t res; if (state_connected == newstate) { OIC_LOG(DEBUG, TAG, "LE is connected"); if (GATT_SUCCESS == status) { - res = CALEClientUpdateDeviceState(address, CA_LE_CONNECTION_STATE, STATE_CONNECTED); + CAResult_t res = CALEClientUpdateDeviceState(address, + CA_LE_CONNECTION_STATE, + STATE_CONNECTED); (*env)->ReleaseStringUTFChars(env, jni_address, address); if (CA_STATUS_OK != res) { @@ -4271,7 +4273,9 @@ Java_org_iotivity_ca_CaLeClientInterface_caLeGattConnectionStateChangeCallback(J { OIC_LOG(DEBUG, TAG, "LE is disconnected"); - res = CALEClientUpdateDeviceState(address, CA_LE_CONNECTION_STATE, STATE_DISCONNECTED); + CAResult_t res = CALEClientUpdateDeviceState(address, + CA_LE_CONNECTION_STATE, + STATE_DISCONNECTED); (*env)->ReleaseStringUTFChars(env, jni_address, address); if (CA_STATUS_OK != res) { 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 2578f88..4a65ed2 100644 --- a/resource/csdk/connectivity/src/bt_le_adapter/android/calenwmonitor.c +++ b/resource/csdk/connectivity/src/bt_le_adapter/android/calenwmonitor.c @@ -158,7 +158,7 @@ CAResult_t CAGetLEAdapterState() } bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { 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 c25157a..ec1555f 100644 --- a/resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.c +++ b/resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.c @@ -103,7 +103,7 @@ CAResult_t CALEServerCreateJniInterfaceObject() } bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -407,7 +407,7 @@ CAResult_t CALEStartAdvertise() } bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -1453,7 +1453,7 @@ CAResult_t CALEServerInitialize() } bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -1530,7 +1530,7 @@ void CALEServerTerminate() } bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -1586,7 +1586,7 @@ CAResult_t CALEServerSendUnicastMessage(const char* address, const uint8_t* data } bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -1627,7 +1627,7 @@ CAResult_t CALEServerSendMulticastMessage(const uint8_t* data, uint32_t dataLen) } bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -1679,7 +1679,7 @@ CAResult_t CALEServerStartMulticastServer() } bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -1741,7 +1741,7 @@ CAResult_t CALEServerStopMulticastServer() } bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -2473,7 +2473,7 @@ CAResult_t CAStopLEGattServer() } bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { diff --git a/resource/csdk/connectivity/src/cablockwisetransfer.c b/resource/csdk/connectivity/src/cablockwisetransfer.c index a78aa06..8f5f131 100644 --- a/resource/csdk/connectivity/src/cablockwisetransfer.c +++ b/resource/csdk/connectivity/src/cablockwisetransfer.c @@ -2333,7 +2333,7 @@ CAResult_t CACheckBlockDataValidation(const CAData_t *sendData, CABlockData_t ** VERIFY_NON_NULL(sendData, TAG, "sendData"); VERIFY_NON_NULL(blockData, TAG, "blockData"); - CABlockDataID_t* blockDataID; + CABlockDataID_t* blockDataID = NULL; if(sendData->requestInfo) { blockDataID = CACreateBlockDatablockId( diff --git a/resource/csdk/connectivity/src/cainterfacecontroller.c b/resource/csdk/connectivity/src/cainterfacecontroller.c index 7ae093c..125b610 100644 --- a/resource/csdk/connectivity/src/cainterfacecontroller.c +++ b/resource/csdk/connectivity/src/cainterfacecontroller.c @@ -451,9 +451,8 @@ CAResult_t CASendMulticastData(const CAEndpoint_t *endpoint, const void *data, u int index = CAGetAdapterIndex(connType); if (0 > index) - if (-1 == index) { - OIC_LOG(DEBUG, TAG, "unknown connectivity type!"); + OIC_LOG(ERROR, TAG, "unknown connectivity type!"); continue; } diff --git a/resource/csdk/connectivity/src/camessagehandler.c b/resource/csdk/connectivity/src/camessagehandler.c index a9d554e..2d17312 100644 --- a/resource/csdk/connectivity/src/camessagehandler.c +++ b/resource/csdk/connectivity/src/camessagehandler.c @@ -140,7 +140,6 @@ static CAData_t* CAGenerateHandlerData(const CAEndpoint_t *endpoint, } OIC_LOG_V(DEBUG, TAG, "address : %s", ep->addr); - CAResult_t result; if(CA_RESPONSE_DATA == dataType) { @@ -153,7 +152,7 @@ static CAData_t* CAGenerateHandlerData(const CAEndpoint_t *endpoint, return NULL; } - result = CAGetResponseInfoFromPDU(data, resInfo, endpoint); + CAResult_t result = CAGetResponseInfoFromPDU(data, resInfo, endpoint); if (CA_STATUS_OK != result) { OIC_LOG(ERROR, TAG, "CAGetResponseInfoFromPDU Failed"); @@ -182,7 +181,7 @@ static CAData_t* CAGenerateHandlerData(const CAEndpoint_t *endpoint, return NULL; } - result = CAGetRequestInfoFromPDU(data, endpoint, reqInfo); + CAResult_t result = CAGetRequestInfoFromPDU(data, endpoint, reqInfo); if (CA_STATUS_OK != result) { OIC_LOG(ERROR, TAG, "CAGetRequestInfoFromPDU failed"); @@ -415,7 +414,7 @@ static CAResult_t CAProcessMulticastData(const CAData_t *data) coap_pdu_t *pdu = NULL; CAInfo_t *info = NULL; coap_list_t *options = NULL; - coap_transport_type transport; + coap_transport_type transport = coap_udp; CAResult_t res = CA_SEND_FAILED; if (NULL != data->requestInfo) { @@ -520,11 +519,12 @@ static CAResult_t CAProcessSendData(const CAData_t *data) coap_pdu_t *pdu = NULL; CAInfo_t *info = NULL; coap_list_t *options = NULL; - coap_transport_type transport; + coap_transport_type transport = coap_udp; if (SEND_TYPE_UNICAST == type) { OIC_LOG(DEBUG,TAG,"Unicast message"); + #ifdef ROUTING_GATEWAY /* * When forwarding a packet, do not attempt retransmission as its the responsibility of diff --git a/resource/csdk/connectivity/src/caprotocolmessage.c b/resource/csdk/connectivity/src/caprotocolmessage.c index 7d84c1c..25d0bd7 100644 --- a/resource/csdk/connectivity/src/caprotocolmessage.c +++ b/resource/csdk/connectivity/src/caprotocolmessage.c @@ -313,7 +313,7 @@ coap_pdu_t *CAGeneratePDUImpl(code_t code, const CAInfo_t *info, #endif { OIC_LOG_V(DEBUG, TAG, "msgID is %d", info->messageId); - uint16_t message_id; + uint16_t message_id = 0; if (0 == info->messageId) { /* initialize message id */ @@ -662,7 +662,7 @@ int CAOrderOpts(void *a, void *b) uint32_t CAGetOptionCount(coap_opt_iterator_t opt_iter) { uint32_t count = 0; - coap_opt_t *option; + coap_opt_t *option = NULL; while ((option = coap_option_next(&opt_iter))) { @@ -747,7 +747,7 @@ CAResult_t CAGetInfoFromPDU(const coap_pdu_t *pdu, const CAEndpoint_t *endpoint, } } - coap_opt_t *option; + coap_opt_t *option = NULL; char optionResult[CA_MAX_URI_LENGTH] = {0}; uint32_t idx = 0; uint32_t optionLength = 0; @@ -962,17 +962,13 @@ CAResult_t CAGetTokenFromPDU(const coap_hdr_t *pdu_hdr, CAInfo_t *outInfo, VERIFY_NON_NULL(outInfo, TAG, "outInfo"); VERIFY_NON_NULL(endpoint, TAG, "endpoint"); - coap_transport_type transport; + coap_transport_type transport = coap_udp; #ifdef WITH_TCP if (CAIsSupportedCoAPOverTCP(endpoint->adapter)) { transport = coap_get_tcp_header_type_from_initbyte(((unsigned char *)pdu_hdr)[0] >> 4); } - else #endif - { - transport = coap_udp; - } unsigned char* token = NULL; unsigned int token_length = 0; diff --git a/resource/csdk/connectivity/src/ip_adapter/android/caipnwmonitor.c b/resource/csdk/connectivity/src/ip_adapter/android/caipnwmonitor.c index ff70009..0809c8d 100644 --- a/resource/csdk/connectivity/src/ip_adapter/android/caipnwmonitor.c +++ b/resource/csdk/connectivity/src/ip_adapter/android/caipnwmonitor.c @@ -213,7 +213,6 @@ u_arraylist_t *CAIPGetInterfaceInformation(int desiredIndex) caglobals.ip.nm.numIfItems = 0; for (size_t i = 0; i < interfaces; i++) { - CAResult_t result = CA_STATUS_OK; struct ifreq* item = &ifr[i]; char *name = item->ifr_name; struct sockaddr_in *sa4 = (struct sockaddr_in *)&item->ifr_addr; @@ -245,7 +244,7 @@ u_arraylist_t *CAIPGetInterfaceInformation(int desiredIndex) } // Add IPv4 interface - result = CAAddInterfaceItem(iflist, ifindex, name, AF_INET, ipv4addr, flags); + CAResult_t result = CAAddInterfaceItem(iflist, ifindex, name, AF_INET, ipv4addr, flags); if (CA_STATUS_OK != result) { goto exit; @@ -321,7 +320,7 @@ CAResult_t CAIPJniInit() return CA_STATUS_FAILED; } - JNIEnv* env; + JNIEnv* env = NULL; if ((*jvm)->GetEnv(jvm, (void**) &env, JNI_VERSION_1_6) != JNI_OK) { OIC_LOG(ERROR, TAG, "Could not get JNIEnv pointer"); @@ -380,7 +379,7 @@ static CAResult_t CAIPDestroyJniInterface() } bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*jvm)->GetEnv(jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { diff --git a/resource/csdk/connectivity/src/ip_adapter/caipserver.c b/resource/csdk/connectivity/src/ip_adapter/caipserver.c index e310c92..5f056a1 100644 --- a/resource/csdk/connectivity/src/ip_adapter/caipserver.c +++ b/resource/csdk/connectivity/src/ip_adapter/caipserver.c @@ -247,7 +247,7 @@ static void CASelectReturned(fd_set *readFds, int ret) static CAResult_t CAReceiveMessage(int fd, CATransportFlags_t flags) { - char recvBuffer[COAP_MAX_PDU_SIZE]; + char recvBuffer[COAP_MAX_PDU_SIZE] = {0}; size_t len; int level, type, namelen; diff --git a/resource/csdk/connectivity/src/nfc_adapter/android/canfcserver.c b/resource/csdk/connectivity/src/nfc_adapter/android/canfcserver.c index 9247bc3..0b06a1d 100644 --- a/resource/csdk/connectivity/src/nfc_adapter/android/canfcserver.c +++ b/resource/csdk/connectivity/src/nfc_adapter/android/canfcserver.c @@ -133,7 +133,7 @@ CAResult_t CANfcCreateJniInterfaceObject() VERIFY_NON_NULL(g_jvm, TAG, "g_jvm"); bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -243,7 +243,7 @@ CAResult_t CANFCStartServer() OIC_LOG(INFO, TAG, "CANFCStartServer : IN"); - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -531,7 +531,7 @@ CAResult_t CANfcSendDataImpl(const CAEndpoint_t * ep, const char* data, uint32_t OIC_LOG(INFO, TAG, "CANfcSendDataImpl moved env outside"); bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { diff --git a/resource/csdk/connectivity/test/cablocktransfertest.cpp b/resource/csdk/connectivity/test/cablocktransfertest.cpp index d43c6f5..09e7550 100644 --- a/resource/csdk/connectivity/test/cablocktransfertest.cpp +++ b/resource/csdk/connectivity/test/cablocktransfertest.cpp @@ -29,7 +29,8 @@ class CABlockTransferTests : public testing::Test { protected: - virtual void SetUp() { + virtual void SetUp() + { CAInitialize(); } diff --git a/resource/csdk/connectivity/util/src/btpairing/android/cabtpairing.c b/resource/csdk/connectivity/util/src/btpairing/android/cabtpairing.c index b982b74..0d24bad 100644 --- a/resource/csdk/connectivity/util/src/btpairing/android/cabtpairing.c +++ b/resource/csdk/connectivity/util/src/btpairing/android/cabtpairing.c @@ -46,7 +46,7 @@ static const char CLASSPATH_BT_DEVICE[] = "android/bluetooth/BluetoothDevice"; static void CABTPaitingCreateJNIInterfaceObject(jobject context) { - JNIEnv* env; + JNIEnv* env = NULL; OIC_LOG(INFO, TAG, "OICEDRCreateJNIInterfaceObject"); if ((*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6) != JNI_OK) diff --git a/resource/csdk/connectivity/util/src/camanager/android/caleconnectionmanager.c b/resource/csdk/connectivity/util/src/camanager/android/caleconnectionmanager.c index 12d4e0f..c77ea8f 100644 --- a/resource/csdk/connectivity/util/src/camanager/android/caleconnectionmanager.c +++ b/resource/csdk/connectivity/util/src/camanager/android/caleconnectionmanager.c @@ -50,7 +50,7 @@ CAResult_t CASetLEClientAutoConnectionDeviceInfo(const char* address) VERIFY_NON_NULL(address, TAG, "address"); bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { @@ -126,7 +126,7 @@ CAResult_t CAUnsetLEClientAutoConnectionDeviceInfo(const char* address) VERIFY_NON_NULL(address, TAG, "address"); bool isAttached = false; - JNIEnv* env; + JNIEnv* env = NULL; jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6); if (JNI_OK != res) { -- 2.7.4