yystopf
/
openharmony_kernel_liteos_m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!584 主干告警清零 

Merge pull request !584 from yinjiaming/OpenHarmony-2.2-Beta2
This commit is contained in:
openharmony_ci 2022-02-07 11:23:28 +00:00 committed by Gitee
parent 800ca76df2 b9292feaa8
commit d58d8042e6
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/shell/src/cmds/vfs_shellcmd.c
View File

@ -259,7 +259,7 @@ int OsShellCmdCat(int argc, const char **argv)
char *fullpath = NULL; char *fullpath = NULL;
int ret; int ret;
CHAR buf[CAT_BUF_SIZE]; CHAR buf[CAT_BUF_SIZE];
size_t size; ssize_t size;
char *shellWorkingDirectory = OsShellGetWorkingDirtectory(); char *shellWorkingDirectory = OsShellGetWorkingDirtectory();
@ -283,7 +283,7 @@ int OsShellCmdCat(int argc, const char **argv)
do { do {
(void)memset_s(buf, sizeof(buf), 0, CAT_BUF_SIZE); (void)memset_s(buf, sizeof(buf), 0, CAT_BUF_SIZE);
size = read(fd, buf, CAT_BUF_SIZE - 1); size = read(fd, buf, CAT_BUF_SIZE - 1);
if ((int)size < 0) { if (size < 0) {
free(fullpath); free(fullpath);
close(fd); close(fd);
return -1; return -1;

2
kal/posix/src/mqueue.c
View File

@ -384,7 +384,7 @@ int OsMqGetAttr(mqd_t personal, struct mq_attr *mqAttr)
mqueueCB = privateMqPersonal->mq_posixdes; mqueueCB = privateMqPersonal->mq_posixdes;
mqAttr->mq_maxmsg = mqueueCB->mqcb->queueLen; mqAttr->mq_maxmsg = mqueueCB->mqcb->queueLen;
mqAttr->mq_msgsize = mqueueCB->mqcb->queueSize - sizeof(UINT32); mqAttr->mq_msgsize = (long)(mqueueCB->mqcb->queueSize - sizeof(UINT32));
mqAttr->mq_curmsgs = mqueueCB->mqcb->readWriteableCnt[OS_QUEUE_READ]; mqAttr->mq_curmsgs = mqueueCB->mqcb->readWriteableCnt[OS_QUEUE_READ];
mqAttr->mq_flags = privateMqPersonal->mq_flags; mqAttr->mq_flags = privateMqPersonal->mq_flags;
(VOID)pthread_mutex_unlock(&g_mqueueMutex); (VOID)pthread_mutex_unlock(&g_mqueueMutex);

2
kal/posix/src/time.c
View File

@ -251,7 +251,7 @@ STATIC VOID OsGetHwTime(struct timespec *hwTime)
(cycle % OS_SYS_CLOCK) * OS_SYS_NS_PER_SECOND / OS_SYS_CLOCK; (cycle % OS_SYS_CLOCK) * OS_SYS_NS_PER_SECOND / OS_SYS_CLOCK;
hwTime->tv_sec = (time_t)(nowNsec / OS_SYS_NS_PER_SECOND); hwTime->tv_sec = (time_t)(nowNsec / OS_SYS_NS_PER_SECOND);
hwTime->tv_nsec = nowNsec % OS_SYS_NS_PER_SECOND; hwTime->tv_nsec = (long)(nowNsec % OS_SYS_NS_PER_SECOND);
} }
STATIC VOID OsGetRealTime(struct timespec *realTime) STATIC VOID OsGetRealTime(struct timespec *realTime)