From c0d343ad461c6506b2e9ddcb729151740a5e87b3 Mon Sep 17 00:00:00 2001 From: "jihwan.seo" Date: Mon, 17 Aug 2015 14:06:53 +0900 Subject: [PATCH] removed unnecessary BLE code related to u_arraylist_t it is about the code after Change 2205 merged. https://gerrit.iotivity.org/gerrit/#/c/2205/ Change-Id: I3183883efa7914a065dbf56fd122b52e1e720a03 Signed-off-by: jihwan.seo Reviewed-on: https://gerrit.iotivity.org/gerrit/2216 Tested-by: jenkins-iotivity Reviewed-by: Jon A. Cruz --- .../src/bt_le_adapter/android/caleclient.c | 45 ++++++++++++---------- .../src/bt_le_adapter/android/caleclient.h | 8 ---- .../src/bt_le_adapter/android/caleserver.c | 20 ++-------- .../src/bt_le_adapter/android/caleserver.h | 7 ---- 4 files changed, 28 insertions(+), 52 deletions(-) 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 54d19fc..075c9bd 100644 --- a/resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.c +++ b/resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.c @@ -2221,7 +2221,12 @@ CAResult_t CALEClientRemoveDeviceInScanDeviceList(JNIEnv *env, jstring address) (*env)->ReleaseStringUTFChars(env, jni_setAddress, setAddress); (*env)->ReleaseStringUTFChars(env, address, remoteAddress); - CALEClientReorderingList(index, g_deviceList); + if (NULL == u_arraylist_remove(g_deviceList, index)) + { + OIC_LOG(ERROR, TAG, "List removal failed."); + ca_mutex_unlock(g_deviceListMutex); + return CA_STATUS_FAILED; + } ca_mutex_unlock(g_deviceListMutex); return CA_STATUS_OK; } @@ -2468,8 +2473,15 @@ CAResult_t CALEClientRemoveGattObj(JNIEnv *env, jobject gatt) (*env)->DeleteGlobalRef(env, jarrayObj); (*env)->ReleaseStringUTFChars(env, jni_setAddress, setAddress); (*env)->ReleaseStringUTFChars(env, jni_remoteAddress, remoteAddress); + + if (NULL == u_arraylist_remove(g_gattObjectList, index)) + { + OIC_LOG(ERROR, TAG, "List removal failed."); + ca_mutex_unlock(g_gattObjectMutex); + return CA_STATUS_FAILED; + } ca_mutex_unlock(g_gattObjectMutex); - return CALEClientReorderingList(index, g_gattObjectList); + return CA_STATUS_OK; } (*env)->ReleaseStringUTFChars(env, jni_setAddress, setAddress); (*env)->ReleaseStringUTFChars(env, jni_remoteAddress, remoteAddress); @@ -2537,8 +2549,14 @@ CAResult_t CALEClientRemoveGattObjForAddr(JNIEnv *env, jstring addr) (*env)->ReleaseStringUTFChars(env, jni_setAddress, setAddress); (*env)->ReleaseStringUTFChars(env, addr, remoteAddress); + if (NULL == u_arraylist_remove(g_gattObjectList, index)) + { + OIC_LOG(ERROR, TAG, "List removal failed."); + ca_mutex_unlock(g_gattObjectMutex); + return CA_STATUS_FAILED; + } ca_mutex_unlock(g_gattObjectMutex); - return CALEClientReorderingList(index, g_gattObjectList); + return CA_STATUS_OK; } (*env)->ReleaseStringUTFChars(env, jni_setAddress, setAddress); (*env)->ReleaseStringUTFChars(env, addr, remoteAddress); @@ -2716,12 +2734,12 @@ CAResult_t CALEClientRemoveDeviceState(const char* remoteAddress) OIC_LOG_V(DEBUG, TAG, "remove state : %s", remoteAddress); OICFree(state); - CAResult_t res = CALEClientReorderingList(index, g_deviceStateList); - if(CA_STATUS_OK != res) + if (NULL == u_arraylist_remove(g_deviceStateList, index)) { - OIC_LOG(ERROR, TAG, "CALEClientReorderingList has failed"); - return res; + OIC_LOG(ERROR, TAG, "List removal failed."); + return CA_STATUS_FAILED; } + return CA_STATUS_OK; } } @@ -2873,19 +2891,6 @@ void CALEClientCreateDeviceList() } } -CAResult_t CALEClientReorderingList(uint32_t index, u_arraylist_t *list) -{ - if (u_arraylist_remove(list, index) == NULL) - { - OIC_LOG(ERROR, TAG, "List removal failed."); - return CA_STATUS_FAILED; - } - else - { - return CA_STATUS_OK; - } -} - /** * Check Sent Count for remove g_sendBuffer */ diff --git a/resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.h b/resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.h index 1b04609..708a1c5 100644 --- a/resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.h +++ b/resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.h @@ -509,14 +509,6 @@ bool CALEClientIsSetCharacteristic(const char* remoteAddress); void CALEClientCreateDeviceList(); /** - * Reordering for device state list. - * @param[in] index index of device list that want to reordering. - * @param[in] list the list to reorder. - * @return ::CA_STATUS_OK or ERROR CODES (::CAResult_t error codes in cacommon.h). - */ -CAResult_t CALEClientReorderingList(uint32_t index, u_arraylist_t *list); - -/** * update the counter which data is sent to remote device. * @param[in] env JNI interface pointer. */ 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 52df9ec..8f8ec34 100644 --- a/resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.c +++ b/resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.c @@ -2018,12 +2018,11 @@ CAResult_t CALEServerRemoveDevice(JNIEnv *env, jstring address) (*env)->ReleaseStringUTFChars(env, address, remoteAddress); (*env)->DeleteGlobalRef(env, jarrayObj); - CAResult_t res = CALEServerReorderinglist(index); - if (CA_STATUS_OK != res) + if (NULL == u_arraylist_remove(g_connectedDeviceList, index)) { - OIC_LOG(ERROR, TAG, "CALEServerReorderinglist has failed"); + OIC_LOG(ERROR, TAG, "List removal failed."); ca_mutex_unlock(g_connectedDeviceListMutex); - return res; + return CA_STATUS_FAILED; } ca_mutex_unlock(g_connectedDeviceListMutex); return CA_STATUS_OK; @@ -2041,19 +2040,6 @@ CAResult_t CALEServerRemoveDevice(JNIEnv *env, jstring address) return CA_STATUS_FAILED; } -CAResult_t CALEServerReorderinglist(uint32_t index) -{ - if (u_arraylist_remove(g_connectedDeviceList, index) == NULL) - { - OIC_LOG(ERROR, TAG, "List removal failed."); - return CA_STATUS_FAILED; - } - else - { - return CA_STATUS_OK; - } -} - JNIEXPORT void JNICALL Java_org_iotivity_ca_CaLeServerInterface_caLeRegisterGattServerCallback(JNIEnv *env, jobject obj, jobject callback) diff --git a/resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.h b/resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.h index 1b7a862..48484b5 100644 --- a/resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.h +++ b/resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.h @@ -292,13 +292,6 @@ CAResult_t CALEServerRemoveAllDevices(JNIEnv *env); CAResult_t CALEServerRemoveDevice(JNIEnv *env, jstring address); /** - * Reordering for the list (connected device list). - * @param[in] index index of device list that want to reordering. - * @return ::CA_STATUS_OK or ERROR CODES (::CAResult_t error codes in cacommon.h). - */ -CAResult_t CALEServerReorderinglist(uint32_t index); - -/** * initialize mutex. * @return ::CA_STATUS_OK or ERROR CODES (::CAResult_t error codes in cacommon.h). */ -- 2.7.4