From 69b0ee821fc53093a4f40723791cae9feeac563a Mon Sep 17 00:00:00 2001 From: "jihwan.seo" Date: Tue, 13 Dec 2016 13:49:57 +0900 Subject: [PATCH] removed unreachable code in android JNI Change-Id: Ie193980b00bbab996357c9011d15e9f612fd32b0 Signed-off-by: jihwan.seo Reviewed-on: https://gerrit.iotivity.org/gerrit/15543 Tested-by: jenkins-iotivity Reviewed-by: Dan Mihai Reviewed-by: Larry Sachs Reviewed-by: Ashok Babu Channa --- java/jni/JniProvisionResultListner.cpp | 1 - java/jni/JniUtils.h | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/java/jni/JniProvisionResultListner.cpp b/java/jni/JniProvisionResultListner.cpp index a25f015..d0c2d8e 100644 --- a/java/jni/JniProvisionResultListner.cpp +++ b/java/jni/JniProvisionResultListner.cpp @@ -146,7 +146,6 @@ void JniProvisionResultListner::ProvisionResultCallback(PMResultList_t *result, } return; } - return; } jmethodID midL = env->GetMethodID(clsL, calledFunc.c_str(), "(Ljava/util/List;I)V"); diff --git a/java/jni/JniUtils.h b/java/jni/JniUtils.h index 74e48e6..13858d9 100644 --- a/java/jni/JniUtils.h +++ b/java/jni/JniUtils.h @@ -56,7 +56,7 @@ public: default: ThrowOcException(OC_STACK_INVALID_PARAM, "Unexpected service type"); return OC::ServiceType::OutOfProc; - }; + } } static OC::ModeType getModeType(JNIEnv *env, int type) @@ -74,7 +74,7 @@ public: default: ThrowOcException(OC_STACK_INVALID_PARAM, "Unexpected mode type"); return OC::ModeType::Both; - }; + } } static OC::QualityOfService getQOS(JNIEnv *env, int type) @@ -92,7 +92,7 @@ public: default: ThrowOcException(OC_STACK_INVALID_PARAM, "Unexpected quality of service"); return OC::QualityOfService::NaQos; - }; + } } static OC::ObserveType getObserveType(JNIEnv *env, int type) @@ -106,7 +106,7 @@ public: default: ThrowOcException(OC_STACK_INVALID_PARAM, "Unexpected observe type"); return OC::ObserveType::ObserveAll; - }; + } } static OCEntityHandlerResult getOCEntityHandlerResult(JNIEnv *env, int type) @@ -130,7 +130,7 @@ public: default: ThrowOcException(OC_STACK_INVALID_PARAM, "Unexpected OCEntityHandlerResult"); return OCEntityHandlerResult::OC_EH_ERROR; - }; + } } static std::string stackResultToStr(const int result) -- 2.7.4