diff --git a/adapter/uhdf2/hdi/src/servstat_listener_stub.cpp b/adapter/uhdf2/hdi/src/servstat_listener_stub.cpp index 9eafc8a07d23d85fd2ef78e2878ff381cb7d4b57..ab4781f01d5bd45916c22b14260bddd40f8ae480 100644 --- a/adapter/uhdf2/hdi/src/servstat_listener_stub.cpp +++ b/adapter/uhdf2/hdi/src/servstat_listener_stub.cpp @@ -57,8 +57,7 @@ int32_t ServStatListenerStub::ServStatListenerStubOnReceive( const char *info = data.ReadCString(); status.info = (info == nullptr) ? "" : info; - HDF_LOGI("%{public}s call func OnReceive, serviceName: %{public}s, status: %{public}d", - __func__, status.serviceName.c_str(), status.status); + HDF_LOGI("call OnReceive, %{public}s, %{public}d", status.serviceName.c_str(), status.status); OnReceive(status); return HDF_SUCCESS; } diff --git a/framework/support/posix/src/osal_time.c b/framework/support/posix/src/osal_time.c index 67c386a1e9a82d2ec364d1879f94c8b5ed7b4b34..0b3d2a56b9eb0f9c50ac2d6b60945aff590c6635 100644 --- a/framework/support/posix/src/osal_time.c +++ b/framework/support/posix/src/osal_time.c @@ -52,7 +52,8 @@ int32_t OsalDiffTime(const OsalTimespec *start, const OsalTimespec *end, OsalTim sec = 1; } - if (end->sec - start->sec - sec < 0 || end->sec > UINT64_MAX - sec - start->sec) { + uint32_t secTime = start->sec + sec; + if (end->sec - secTime < 0 || end->sec > UINT32_MAX - secTime) { HDF_LOGE("%s end time invalid", __func__); return HDF_ERR_INVALID_PARAM; } diff --git a/interfaces/inner_api/hdi/base/hdi_smq.h b/interfaces/inner_api/hdi/base/hdi_smq.h index ecdc37ee7199e2da3488221fa431d1a08101456f..0c488453c16d5a52e108987e365f6aa4ac01a1f3 100644 --- a/interfaces/inner_api/hdi/base/hdi_smq.h +++ b/interfaces/inner_api/hdi/base/hdi_smq.h @@ -401,7 +401,7 @@ bool SharedMemQueue::IsGood() template size_t SharedMemQueue::Align(size_t num, size_t alignSize) { - if ((num + alignSize) < 1 || num > (SIZE_MAX - alignSize) || alignSize > (SIZE_MAX - num)) { + if ((num + alignSize) < 1 || num > (SIZE_MAX - alignSize)) { HDF_LOGE("Invalid parameter num or alignSize"); return 0; }