diff --git a/components/shell/src/cmds/vfs_shellcmd.c b/components/shell/src/cmds/vfs_shellcmd.c index 6a478b714f15e2945e55d305d87906ca14b3abba..73e530f36649d474036c5c6760f2693a17c8adc5 100644 --- a/components/shell/src/cmds/vfs_shellcmd.c +++ b/components/shell/src/cmds/vfs_shellcmd.c @@ -724,7 +724,7 @@ STATIC INT32 OsWildcardExtractDirectory(CHAR *fullpath, VOID *dst, wildcard_type if (d == NULL) { perror("opendir error"); - return VFS_ERROR; + return (INT32)VFS_ERROR; } while (1) { diff --git a/kal/cmsis/cmsis_liteos2.c b/kal/cmsis/cmsis_liteos2.c index bc6ceebf28bbe23408af4fd1cda4a2b3c8c8fe73..b83881552d4ddb23a3c9eaafc88d9558f9ed2840 100644 --- a/kal/cmsis/cmsis_liteos2.c +++ b/kal/cmsis/cmsis_liteos2.c @@ -788,7 +788,7 @@ osStatus_t osTimerStop(osTimerId_t timer_id) uint32_t osTimerIsRunning(osTimerId_t timer_id) { if (OS_INT_ACTIVE) { - return osErrorISR; + return (uint32_t)osErrorISR; } if (timer_id == NULL) { return 0; diff --git a/kal/posix/src/mqueue.c b/kal/posix/src/mqueue.c index 03da4d3d583cec60f69f3effdd44489c335e52e0..1266d82f3923df277c6c49fb8b44a5155ba92f3d 100644 --- a/kal/posix/src/mqueue.c +++ b/kal/posix/src/mqueue.c @@ -163,14 +163,14 @@ STATIC int SaveMqueueName(const CHAR *mqName, struct mqarray *mqueueCB) mqueueCB->mq_name = (char *)LOS_MemAlloc(OS_SYS_MEM_ADDR, nameLen + 1); if (mqueueCB->mq_name == NULL) { errno = ENOMEM; - return LOS_NOK; + return (int)LOS_NOK; } if (strncpy_s(mqueueCB->mq_name, (nameLen + 1), mqName, nameLen) != EOK) { LOS_MemFree(OS_SYS_MEM_ADDR, mqueueCB->mq_name); mqueueCB->mq_name = NULL; errno = EINVAL; - return LOS_NOK; + return (int)LOS_NOK; } mqueueCB->mq_name[nameLen] = '\0'; return LOS_OK; diff --git a/kal/posix/src/pipe.c b/kal/posix/src/pipe.c index 04ff61cd30e7a1045c45385539b42418c57f87ae..4613884b240e89800360b52c0428273b5352fc11 100644 --- a/kal/posix/src/pipe.c +++ b/kal/posix/src/pipe.c @@ -215,6 +215,7 @@ STATIC INT32 PipeDevRegister(CHAR *devName, UINT32 len) { INT32 ret; INT32 num = PipeDevNumAlloc(); + struct PipeDev *devTemp = NULL; if (num < 0) { return -ENODEV; } @@ -228,7 +229,7 @@ STATIC INT32 PipeDevRegister(CHAR *devName, UINT32 len) (VOID)snprintf_s(dev->devName, PIPE_DEV_NAME_MAX, PIPE_DEV_NAME_MAX - 1, "%s%d", PIPE_DEV_PATH, num); (VOID)memcpy_s(devName, len, dev->devName, strlen(dev->devName)); - struct PipeDev *devTemp = PipeDevFind(dev->devName); + devTemp = PipeDevFind(dev->devName); if (devTemp != NULL) { ret = -EEXIST; goto ERROR; diff --git a/kal/posix/src/pthread.c b/kal/posix/src/pthread.c index 9daae03b8386769bcdd1687e7f484eda02e2ad6b..11d7548f251f1d0772a94a59b2618fcd316b86a4 100644 --- a/kal/posix/src/pthread.c +++ b/kal/posix/src/pthread.c @@ -504,6 +504,8 @@ int pthread_detach(pthread_t thread) void pthread_exit(void *retVal) { UINT32 intSave; + LosTaskCB *tcb = NULL; + PthreadData *pthreadData = NULL; pthread_t thread = pthread_self(); if (!IsPthread(thread)) { @@ -511,9 +513,9 @@ void pthread_exit(void *retVal) goto EXIT; } - LosTaskCB *tcb = OS_TCB_FROM_TID((UINT32)thread); + tcb = OS_TCB_FROM_TID((UINT32)thread); tcb->joinRetval = (UINTPTR)retVal; - PthreadData *pthreadData = (PthreadData *)(UINTPTR)tcb->arg; + pthreadData = (PthreadData *)(UINTPTR)tcb->arg; if (pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL) != 0) { PRINT_ERR("%s: %d failed\n", __FUNCTION__, __LINE__); } diff --git a/kernel/src/mm/los_memory.c b/kernel/src/mm/los_memory.c index 65ad78d6ba919c6d82c3f30185d1c2994bef1d67..8482140898494e2af37b1a0f97751f6709d8683e 100644 --- a/kernel/src/mm/los_memory.c +++ b/kernel/src/mm/los_memory.c @@ -1901,14 +1901,12 @@ STATIC VOID OsMemIntegrityCheckError(struct OsMemPoolHead *pool, if (taskID >= LOSCFG_BASE_CORE_TSK_LIMIT) { MEM_UNLOCK(pool, intSave); LOS_Panic("Task ID %u in pre node is invalid!\n", taskID); - return; } taskCB = OS_TCB_FROM_TID(taskID); if ((taskCB->taskStatus & OS_TASK_STATUS_UNUSED) || (taskCB->taskEntry == NULL)) { MEM_UNLOCK(pool, intSave); LOS_Panic("\r\nTask ID %u in pre node is not created!\n", taskID); - return; } } else { PRINTK("The prev node is free\n"); diff --git a/utils/los_compiler.h b/utils/los_compiler.h index 54131e37afa74c31d89e5d14309276fb85534e6a..820be684959b0ce350a116ae1186e97d0b065398 100644 --- a/utils/los_compiler.h +++ b/utils/los_compiler.h @@ -34,7 +34,7 @@ /* for IAR Compiler */ #ifdef __ICCARM__ -#include"iccarm_builtin.h" +#include "iccarm_builtin.h" #endif #ifdef __cplusplus diff --git a/utils/los_debug.c b/utils/los_debug.c index 1052b7d2015a2a1ad07a3c175532856c217063cf..0af5a9808276b4f24de28d70401b9e5950393931 100644 --- a/utils/los_debug.c +++ b/utils/los_debug.c @@ -87,7 +87,7 @@ VOID OsDoExcHook(EXC_TYPE excType) INT32 OsLogLevelCheck(INT32 level) { if (level > PRINT_LEVEL) { - return LOS_NOK; + return (INT32)LOS_NOK; } if ((level != LOG_COMMON_LEVEL) && ((level > LOG_EMG_LEVEL) && (level <= LOG_DEBUG_LEVEL))) {