fix: 主干告警清零
【背景】 主干告警清零 【修改方案】 在有符号数与无符号数混用的地方添加了强制类型转换 【影响】 对现有的产品编译不会有影响。 re #I4SBQE Signed-off-by: yinjiaming <yinjiaming@huawei.com> Change-Id: I70b4613726706ff28bd852f05a411ba729cea72c
This commit is contained in:
parent
a0b126246e
commit
0846a8a1db
|
@ -67,7 +67,7 @@ sys_thread_t sys_thread_new(const char *name, lwip_thread_fn thread, void *arg,
|
|||
task.pfnTaskEntry = (TSK_ENTRY_FUNC)thread;
|
||||
task.uwStackSize = stackSize;
|
||||
task.pcName = (char *)name;
|
||||
task.usTaskPrio = prio;
|
||||
task.usTaskPrio = (UINT16)prio;
|
||||
task.uwArg = (UINTPTR)arg;
|
||||
task.uwResved = LOS_TASK_STATUS_DETACHED;
|
||||
ret = LOS_TaskCreate(&taskID, &task);
|
||||
|
|
|
@ -385,7 +385,7 @@ static int OsShellCmdDoCp(const char *srcFilePath, const char *dstFileName)
|
|||
char *dstFilePath = NULL;
|
||||
char *buf = NULL;
|
||||
const char *filename = NULL;
|
||||
size_t rdSize, wrSize;
|
||||
ssize_t rdSize, wrSize;
|
||||
int srcFd = -1;
|
||||
int dstFd = -1;
|
||||
struct stat statBuf;
|
||||
|
|
|
@ -144,7 +144,7 @@ int pthread_getschedparam(pthread_t thread, int *policy, struct sched_param *par
|
|||
}
|
||||
|
||||
*policy = SCHED_RR;
|
||||
param->sched_priority = prio;
|
||||
param->sched_priority = (int)prio;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -205,6 +205,7 @@ void pthread_exit(void *retVal)
|
|||
|
||||
int pthread_setname_np(pthread_t thread, const char *name)
|
||||
{
|
||||
errno_t ret;
|
||||
char *taskName = LOS_TaskNameGet((UINT32)thread);
|
||||
if (taskName == NULL || !IsPthread(thread)) {
|
||||
return EINVAL;
|
||||
|
@ -212,13 +213,16 @@ int pthread_setname_np(pthread_t thread, const char *name)
|
|||
if (strnlen(name, PTHREAD_NAMELEN) >= PTHREAD_NAMELEN) {
|
||||
return ERANGE;
|
||||
}
|
||||
(void)strcpy_s(taskName, PTHREAD_NAMELEN, name);
|
||||
ret = strcpy_s(taskName, PTHREAD_NAMELEN, name);
|
||||
if (ret != EOK) {
|
||||
return ret;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int pthread_getname_np(pthread_t thread, char *buf, size_t buflen)
|
||||
{
|
||||
int ret;
|
||||
errno_t ret;
|
||||
|
||||
const char *name = LOS_TaskNameGet((UINT32)thread);
|
||||
if (name == NULL || !IsPthread(thread)) {
|
||||
|
@ -226,7 +230,7 @@ int pthread_getname_np(pthread_t thread, char *buf, size_t buflen)
|
|||
}
|
||||
if (buflen > strlen(name)) {
|
||||
ret = strcpy_s(buf, buflen, name);
|
||||
if (ret == 0) {
|
||||
if (ret == EOK) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -231,7 +231,7 @@ int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
|
|||
}
|
||||
|
||||
clock_gettime(CLOCK_REALTIME, &tp);
|
||||
currTime = (UINT64)tp.tv_sec * OS_SYS_NS_PER_SECOND + tp.tv_nsec;
|
||||
currTime = (UINT64)tp.tv_sec * OS_SYS_NS_PER_SECOND + (UINT64)tp.tv_nsec;
|
||||
nseconds = (UINT64)ts->tv_sec * OS_SYS_NS_PER_SECOND + ts->tv_nsec;
|
||||
if (currTime >= nseconds) {
|
||||
return ETIMEDOUT;
|
||||
|
|
|
@ -250,7 +250,7 @@ STATIC VOID OsGetHwTime(struct timespec *hwTime)
|
|||
UINT64 nowNsec = (cycle / OS_SYS_CLOCK) * OS_SYS_NS_PER_SECOND +
|
||||
(cycle % OS_SYS_CLOCK) * OS_SYS_NS_PER_SECOND / OS_SYS_CLOCK;
|
||||
|
||||
hwTime->tv_sec = 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;
|
||||
}
|
||||
|
||||
|
@ -354,7 +354,7 @@ int clock_getres(clockid_t clockID, struct timespec *tp)
|
|||
case CLOCK_REALTIME:
|
||||
case CLOCK_MONOTONIC_COARSE:
|
||||
case CLOCK_REALTIME_COARSE:
|
||||
tp->tv_nsec = OS_SYS_NS_PER_SECOND / OS_SYS_CLOCK;
|
||||
tp->tv_nsec = (long)(OS_SYS_NS_PER_SECOND / OS_SYS_CLOCK);
|
||||
tp->tv_sec = 0;
|
||||
return 0;
|
||||
case CLOCK_THREAD_CPUTIME_ID:
|
||||
|
@ -660,5 +660,5 @@ unsigned sleep(unsigned seconds)
|
|||
|
||||
specTime.tv_sec = (time_t)(nanoseconds / OS_SYS_NS_PER_SECOND);
|
||||
specTime.tv_nsec = (long)(nanoseconds % OS_SYS_NS_PER_SECOND);
|
||||
return nanosleep(&specTime, NULL);
|
||||
return (unsigned)nanosleep(&specTime, NULL);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue