diff --git a/arch/arm/arm/src/los_arch_mmu.c b/arch/arm/arm/src/los_arch_mmu.c index 435dcfaf..ccefd5ba 100644 --- a/arch/arm/arm/src/los_arch_mmu.c +++ b/arch/arm/arm/src/los_arch_mmu.c @@ -871,7 +871,7 @@ STATIC VOID OsSetKSectionAttr(UINTPTR virtAddr, BOOL uncached) kSpace->archMmu.virtTtb = (PTE_T *)g_firstPageTable; kSpace->archMmu.physTtb = LOS_PaddrQuery(kSpace->archMmu.virtTtb); status = LOS_ArchMmuUnmap(&kSpace->archMmu, virtAddr, - (bssEndBoundary - virtAddr) >> MMU_DESCRIPTOR_L2_SMALL_SHIFT); + (bssEndBoundary - virtAddr) >> MMU_DESCRIPTOR_L2_SMALL_SHIFT); if (status != ((bssEndBoundary - virtAddr) >> MMU_DESCRIPTOR_L2_SMALL_SHIFT)) { VM_ERR("unmap failed, status: %d", status); return; @@ -882,8 +882,8 @@ STATIC VOID OsSetKSectionAttr(UINTPTR virtAddr, BOOL uncached) flags |= VM_MAP_REGION_FLAG_UNCACHED; } status = LOS_ArchMmuMap(&kSpace->archMmu, virtAddr, SYS_MEM_BASE, - (textStart - virtAddr) >> MMU_DESCRIPTOR_L2_SMALL_SHIFT, - flags); + (textStart - virtAddr) >> MMU_DESCRIPTOR_L2_SMALL_SHIFT, + flags); if (status != ((textStart - virtAddr) >> MMU_DESCRIPTOR_L2_SMALL_SHIFT)) { VM_ERR("mmap failed, status: %d", status); return; @@ -910,9 +910,9 @@ STATIC VOID OsSetKSectionAttr(UINTPTR virtAddr, BOOL uncached) flags |= VM_MAP_REGION_FLAG_UNCACHED; } status = LOS_ArchMmuMap(&kSpace->archMmu, bssEndBoundary, - SYS_MEM_BASE + bssEndBoundary - virtAddr, - kmallocLength >> MMU_DESCRIPTOR_L2_SMALL_SHIFT, - flags); + SYS_MEM_BASE + bssEndBoundary - virtAddr, + kmallocLength >> MMU_DESCRIPTOR_L2_SMALL_SHIFT, + flags); if (status != (kmallocLength >> MMU_DESCRIPTOR_L2_SMALL_SHIFT)) { VM_ERR("mmap failed, status: %d", status); return; diff --git a/arch/arm/arm/src/los_exc.c b/arch/arm/arm/src/los_exc.c index 1c0c89cd..bdaa4f09 100644 --- a/arch/arm/arm/src/los_exc.c +++ b/arch/arm/arm/src/los_exc.c @@ -38,7 +38,6 @@ #include "los_excinfo_pri.h" #endif #include "los_sys_stack_pri.h" -#include "los_stackinfo_pri.h" #ifdef LOSCFG_COREDUMP #include "los_coredump.h" #endif @@ -723,7 +722,7 @@ VOID BackTraceSub(UINTPTR regFP) } backLR = *(UINTPTR *)(UINTPTR)kvaddr; #else - backLR = *(UINTPTR *)(UINTPTR)kvaddr; + backLR = *(UINTPTR *)(UINTPTR)kvaddr; if (IsValidFP(tmpFP - POINTER_SIZE, stackStart, stackEnd, &kvaddr) == FALSE) { PrintExcInfo("traceback backFP check failed, backFP: 0x%x\n", tmpFP - POINTER_SIZE); return; @@ -1007,7 +1006,7 @@ STATIC VOID OsCheckAllCpuStatus(VOID) OsWaitOtherCoresHandleExcEnd(currCpuID); } else { - if (g_excFromUserMode[g_currHandleExcCpuID] == TRUE) { + if ((g_currHandleExcCpuID < LOSCFG_KERNEL_CORE_NUM) && (g_excFromUserMode[g_currHandleExcCpuID] == TRUE)) { g_currHandleExcCpuID = currCpuID; LOS_SpinUnlock(&g_excSerializerSpin); target = (UINT32)(OS_MP_CPU_ALL & ~CPUID_TO_AFFI_MASK(currCpuID)); diff --git a/compat/posix/src/time.c b/compat/posix/src/time.c index 71870721..865f8dbd 100644 --- a/compat/posix/src/time.c +++ b/compat/posix/src/time.c @@ -456,7 +456,7 @@ static int PthreadGetCputime(clockid_t clockID, struct timespec *ats) { uint64_t runtime; UINT32 intSave; - UINT32 tid = ((UINT32) ~((clockID) >> CPUCLOCK_ID_OFFSET)); + UINT32 tid = ((UINT32) ~((UINT32)(clockID) >> CPUCLOCK_ID_OFFSET)); if (OS_TID_CHECK_INVALID(tid)) { return -EINVAL; @@ -482,7 +482,7 @@ static int ProcessGetCputime(clockid_t clockID, struct timespec *ats) { UINT64 runtime; UINT32 intSave; - const pid_t pid = ((pid_t) ~((clockID) >> CPUCLOCK_ID_OFFSET)); + const pid_t pid = ((pid_t) ~((UINT32)(clockID) >> CPUCLOCK_ID_OFFSET)); LosProcessCB *spcb = NULL; if (OsProcessIDUserCheckInvalid(pid) || pid < 0) { @@ -524,7 +524,7 @@ static int GetCputime(clockid_t clockID, struct timespec *tp) static int CheckClock(const clockid_t clockID) { int error = 0; - const pid_t pid = ((pid_t) ~((clockID) >> CPUCLOCK_ID_OFFSET)); + const pid_t pid = ((pid_t) ~((UINT32)(clockID) >> CPUCLOCK_ID_OFFSET)); if (!((UINT32)clockID & CPUCLOCK_PERTHREAD_MASK)) { LosProcessCB *spcb = NULL; diff --git a/fs/fat/os_adapt/fatfs.c b/fs/fat/os_adapt/fatfs.c index 06c33d57..0330388e 100644 --- a/fs/fat/os_adapt/fatfs.c +++ b/fs/fat/os_adapt/fatfs.c @@ -238,7 +238,8 @@ static mode_t fatfs_get_mode(BYTE attribute, mode_t fs_mode) return fs_mode; } -static enum VnodeType fatfstype_2_vnodetype(BYTE type) { +static enum VnodeType fatfstype_2_vnodetype(BYTE type) +{ switch (type) { case AM_ARC: return VNODE_TYPE_REG; @@ -286,7 +287,7 @@ static FRESULT init_cluster(DIR_FILE *pdfp, DIR *dp_new, FATFS *fs, int type, co mem_set(dir, 0, SS(fs)); if (type == AM_LNK && target) { /* Write target to symlink */ - strcpy_s((char *)dir, SS(fs), target); + (void)strcpy_s((char *)dir, SS(fs), target); } else { /* Write the dir cluster */ mem_set(dir, 0, SS(fs)); diff --git a/fs/include/fs/file.h b/fs/include/fs/file.h index cb05f0bc..11b78782 100644 --- a/fs/include/fs/file.h +++ b/fs/include/fs/file.h @@ -473,7 +473,7 @@ off64_t file_seek64(struct file *filep, off64_t offset, int whence); * ****************************************************************************/ -int files_allocate(struct Vnode *vnode, int oflags, off_t pos,void *priv, int minfd); +int files_allocate(struct Vnode *vnode, int oflags, off_t pos, void *priv, int minfd); /**************************************************************************** * Name: files_close diff --git a/fs/vfs/operation/fs_file.c b/fs/vfs/operation/fs_file.c index 245d8f5d..1e600bbb 100644 --- a/fs/vfs/operation/fs_file.c +++ b/fs/vfs/operation/fs_file.c @@ -406,7 +406,7 @@ int CopyFdToProc(int fd, unsigned int targetPid) return -ESRCH; } - procFd = AssignProcessFd(fdt, 3); + procFd = AssignProcessFd(fdt, 3); // minfd is 3 if (procFd < 0) { if (sem_post(&semId) == -1) { PRINT_ERR("sem_post error, errno %d \n", get_errno()); diff --git a/kernel/base/ipc/los_signal.c b/kernel/base/ipc/los_signal.c index 06fee687..e30f29df 100644 --- a/kernel/base/ipc/los_signal.c +++ b/kernel/base/ipc/los_signal.c @@ -132,7 +132,7 @@ int OsTcbDispatch(LosTaskCB *stcb, siginfo_t *info) if (masked) { /* If signal is in wait list and mask list, need unblock it */ if (LOS_ListEmpty(&sigcb->waitList) || - (!LOS_ListEmpty(&sigcb->waitList) && !OsSigIsMember(&sigcb->sigwaitmask, info->si_signo))) { + (!LOS_ListEmpty(&sigcb->waitList) && !OsSigIsMember(&sigcb->sigwaitmask, info->si_signo))) { OsSigAddSet(&sigcb->sigPendFlag, info->si_signo); } } else { @@ -308,7 +308,7 @@ int OsSigProcessSend(LosProcessCB *spcb, siginfo_t *sigInfo) .receivedTcb = NULL }; - if (info.sigInfo == NULL){ + if (info.sigInfo == NULL) { return -EFAULT; } diff --git a/kernel/base/vm/los_vm_filemap.c b/kernel/base/vm/los_vm_filemap.c index 9a6ec2ce..81a74900 100644 --- a/kernel/base/vm/los_vm_filemap.c +++ b/kernel/base/vm/los_vm_filemap.c @@ -44,7 +44,7 @@ #include "vnode.h" #ifndef UNUSED -#define UNUSED(x) (VOID)x +#define UNUSED(x) (VOID)(x) #endif #ifdef LOSCFG_DEBUG_VERSION diff --git a/kernel/base/vm/los_vm_iomap.c b/kernel/base/vm/los_vm_iomap.c index dde9e472..5acc88fd 100644 --- a/kernel/base/vm/los_vm_iomap.c +++ b/kernel/base/vm/los_vm_iomap.c @@ -34,7 +34,6 @@ #include "los_vm_zone.h" #include "los_vm_common.h" #include "los_vm_map.h" -#include "los_vm_lock.h" #include "los_memory.h" diff --git a/kernel/common/console.c b/kernel/common/console.c index c70466c3..36ccb5ba 100644 --- a/kernel/common/console.c +++ b/kernel/common/console.c @@ -437,10 +437,10 @@ STATIC VOID StoreReadChar(CONSOLE_CB *consoleCB, char ch, INT32 readcount) VOID KillPgrp() { - INT32 consoleId = -1; + INT32 consoleId; LosProcessCB *process = OsCurrProcessGet(); - if ((process->consoleID > CONSOLE_NUM -1 ) || (process->consoleID < 0)) { + if ((process->consoleID > CONSOLE_NUM - 1) || (process->consoleID < 0)) { return; } @@ -872,7 +872,7 @@ STATIC INT32 ConsoleGetTermios(unsigned long arg) return -EFAULT; } - if(LOS_ArchCopyToUser((VOID *)arg, &consoleCB->consoleTermios, sizeof(struct termios)) != 0) { + if (LOS_ArchCopyToUser((VOID *)arg, &consoleCB->consoleTermios, sizeof(struct termios)) != 0) { return -EFAULT; } else { return LOS_OK; diff --git a/kernel/common/los_config.c b/kernel/common/los_config.c index afd45a78..0757fc83 100644 --- a/kernel/common/los_config.c +++ b/kernel/common/los_config.c @@ -83,7 +83,7 @@ LITE_OS_SEC_TEXT_INIT STATIC UINT32 EarliestInit(VOID) LITE_OS_SEC_TEXT_INIT STATIC UINT32 ArchEarlyInit(VOID) { - UINT32 ret = LOS_OK; + UINT32 ret; /* set system counter freq */ #ifndef LOSCFG_TEE_ENABLE diff --git a/kernel/common/los_magickey.c b/kernel/common/los_magickey.c index 7e5f00ee..9368f77f 100644 --- a/kernel/common/los_magickey.c +++ b/kernel/common/los_magickey.c @@ -137,7 +137,7 @@ INT32 CheckMagicKey(CHAR key) PRINTK("Magic key off\n"); } return 1; - } else if (key == 0x03){ /* ctrl + c */ + } else if (key == 0x03) { /* ctrl + c */ KillPgrp(); return 0; } diff --git a/syscall/misc_syscall.c b/syscall/misc_syscall.c index 29b571d9..936d48cc 100644 --- a/syscall/misc_syscall.c +++ b/syscall/misc_syscall.c @@ -35,7 +35,6 @@ #include "sys/resource.h" #include "sys/times.h" #include "sys/utsname.h" -#include "time.h" #include "capability_type.h" #include "capability_api.h" #include "los_process_pri.h"