diff options
author | pedroGitt <pedro.contreiras@amdocs.com> | 2016-10-24 17:21:28 +0200 |
---|---|---|
committer | pedroGitt <pedro.contreiras@amdocs.com> | 2016-10-24 17:21:28 +0200 |
commit | 6b3cb69ded8ac1ec228b1d631b0d78d5c1c06e93 (patch) | |
tree | 638fb980438874ce2caf6ec278894465ce1a94be /java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_utility.cpp | |
parent | acafa69c671907f31fb783e3e09c7cc662e779af (diff) |
Fix compiler warnings
- for 32bits platform target
- when debug flag is not defined
Diffstat (limited to 'java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_utility.cpp')
-rw-r--r-- | java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_utility.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_utility.cpp b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_utility.cpp index e11f7eb..bd93de1 100644 --- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_utility.cpp +++ b/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_utility.cpp @@ -26,7 +26,7 @@ OlmUtility* initializeUtilityMemory() if(NULL != (utilityPtr=(OlmUtility*)malloc(utilitySize))) { utilityPtr = olm_utility(utilityPtr); - LOGD("## initializeUtilityMemory(): success - OLM utility size=%lu",utilitySize); + LOGD("## initializeUtilityMemory(): success - OLM utility size=%lu",static_cast<long unsigned int>(utilitySize)); } else { @@ -61,6 +61,8 @@ JNIEXPORT void OLM_UTILITY_FUNC_DEF(releaseUtilityJni)(JNIEnv *env, jobject thiz { OlmUtility* utilityPtr = NULL; + LOGD("## releaseUtilityJni(): IN"); + if(NULL == (utilityPtr = (OlmUtility*)getUtilityInstanceId(env,thiz))) { LOGE("## releaseUtilityJni(): failure - utility ptr=NULL"); @@ -118,7 +120,7 @@ JNIEXPORT jstring OLM_UTILITY_FUNC_DEF(verifyEd25519SignatureJni)(JNIEnv *env, j size_t signatureLength = (size_t)env->GetStringUTFLength(aSignature); size_t keyLength = (size_t)env->GetStringUTFLength(aKey); size_t messageLength = (size_t)env->GetStringUTFLength(aMessage); - LOGD(" ## verifyEd25519SignatureJni(): signatureLength=%lu keyLength=%lu messageLength=%lu",signatureLength,keyLength,messageLength); + LOGD(" ## verifyEd25519SignatureJni(): signatureLength=%lu keyLength=%lu messageLength=%lu",static_cast<long unsigned int>(signatureLength),static_cast<long unsigned int>(keyLength),static_cast<long unsigned int>(messageLength)); size_t result = olm_ed25519_verify(utilityPtr, (void const *)keyPtr, @@ -134,7 +136,7 @@ JNIEXPORT jstring OLM_UTILITY_FUNC_DEF(verifyEd25519SignatureJni)(JNIEnv *env, j } else { - LOGD("## verifyEd25519SignatureJni(): success - result=%ld", result); + LOGD("## verifyEd25519SignatureJni(): success - result=%lu", static_cast<long unsigned int>(result)); } } @@ -210,7 +212,7 @@ JNIEXPORT jstring OLM_UTILITY_FUNC_DEF(sha256Jni)(JNIEnv *env, jobject thiz, jst // update length (static_cast<char*>(hashValuePtr))[result] = static_cast<char>('\0'); - LOGD("## sha256Jni(): success - result=%lu hashValue=%s",result, (char*)hashValuePtr); + LOGD("## sha256Jni(): success - result=%lu hashValue=%s",static_cast<long unsigned int>(result), (char*)hashValuePtr); sha256RetValue = env->NewStringUTF((const char*)hashValuePtr); } } |