From 67c362ec4ecb1ac7559afa901e2b66fdf87ebde6 Mon Sep 17 00:00:00 2001 From: Way Vadhanasin Date: Fri, 28 Apr 2017 09:35:57 -0700 Subject: [PATCH] resource: Don't log error of oc_mutex_free IOT-2177 Don't log error if oc_mutex_free is called with null. Change-Id: I1e589304f9bce866f5ba18800292204c78d43590 Signed-off-by: Way Vadhanasin Reviewed-on: https://gerrit.iotivity.org/gerrit/19433 Reviewed-by: Dave Thaler Tested-by: jenkins-iotivity Reviewed-by: Dan Mihai (cherry picked from commit 36525788ca27c32354accc504f6dcc5875e1c902) Reviewed-on: https://gerrit.iotivity.org/gerrit/21141 --- resource/c_common/octhread/src/posix/octhread.c | 4 ---- resource/c_common/octhread/src/windows/octhread.c | 6 +----- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/resource/c_common/octhread/src/posix/octhread.c b/resource/c_common/octhread/src/posix/octhread.c index c87ee80..587f9c9 100644 --- a/resource/c_common/octhread/src/posix/octhread.c +++ b/resource/c_common/octhread/src/posix/octhread.c @@ -286,10 +286,6 @@ bool oc_mutex_free(oc_mutex mutex) OIC_LOG_V(ERROR, TAG, "%s Failed to free mutex !", __func__); } } - else - { - OIC_LOG_V(ERROR, TAG, "%s Invalid mutex !", __func__); - } return bRet; } diff --git a/resource/c_common/octhread/src/windows/octhread.c b/resource/c_common/octhread/src/windows/octhread.c index cef1b06..36e7987 100644 --- a/resource/c_common/octhread/src/windows/octhread.c +++ b/resource/c_common/octhread/src/windows/octhread.c @@ -165,11 +165,7 @@ bool oc_mutex_free(oc_mutex mutex) { DeleteCriticalSection(&mutexInfo->mutex); OICFree(mutexInfo); - bRet=true; - } - else - { - OIC_LOG_V(ERROR, TAG, "%s Invalid mutex !", __func__); + bRet = true; } return bRet; -- 2.7.4