Compare commits

..

3 Commits

Author SHA1 Message Date
openharmony_ci
b98d91fcd3 !1193 【修复】OAT告警
Merge pull request !1193 from 石子怡/cherry-pick-1716600957
2024-05-28 12:36:09 +00:00
石子怡
897eb641c4 修复OAT告警
Signed-off-by: 石子怡 <z15319797139@163.com>
2024-05-25 02:47:05 +00:00
石子怡
e1aa01a464 fixed b0520a5 from https://gitee.com/shi-ziyi123/kernel_liteos_a/pulls/1192
修复OAT告警

Signed-off-by: 石子怡 <z15319797139@163.com>
2024-05-25 01:35:57 +00:00

View File

@@ -270,7 +270,6 @@ STATIC INT32 DoMqueueClose(struct mqpersonal *privateMqPersonal)
{
struct mqarray *mqueueCB = NULL;
struct mqpersonal *tmp = NULL;
INT32 ret;
mqueueCB = privateMqPersonal->mq_posixdes;
if (mqueueCB == NULL || mqueueCB->mq_personal == NULL) {
@@ -278,12 +277,6 @@ STATIC INT32 DoMqueueClose(struct mqpersonal *privateMqPersonal)
return LOS_NOK;
}
if ((mqueueCB->unlinkflag == TRUE) && (privateMqPersonal->mq_next == NULL)) {
ret = DoMqueueDelete(mqueueCB);
if (ret < 0) {
return ret;
}
}
/* find the personal and remove */
if (mqueueCB->mq_personal == privateMqPersonal) {
mqueueCB->mq_personal = privateMqPersonal->mq_next;
@@ -305,6 +298,9 @@ STATIC INT32 DoMqueueClose(struct mqpersonal *privateMqPersonal)
/* free the personal */
(VOID)LOS_MemFree(OS_SYS_MEM_ADDR, privateMqPersonal);
if ((mqueueCB->unlinkflag == TRUE) && (mqueueCB->mq_personal == NULL)) {
return DoMqueueDelete(mqueueCB);
}
return LOS_OK;
}