fix: 内核告警修复

【背景】
经代码扫描工具检测,内核代码中存在
可以修复的告警

【修改方案】
1.将单语句的if, while等加上括号
2.将C语言风格的类型转换变为C++风格

【影响】
对现有的产品编译不会有影响。

Signed-off-by: yinjiaming <yinjiaming@huawei.com>
Change-Id: I7d4a04a8904abb3c33e843049bf15f4386d3efd8
This commit is contained in:
yinjiaming
2022-09-09 11:50:48 +08:00
parent 71e51d8813
commit 96b2d557ac
155 changed files with 532 additions and 460 deletions

View File

@@ -71,7 +71,7 @@ static void *ThreadFunc4(void *arg)
ret = pthread_cancel(pthread);
}
}
return (void *)i;
return reinterpret_cast<void *>(i);
EXIT:
return NULL;
@@ -100,7 +100,7 @@ static void *ThreadFunc3(void *arg)
}
ICUNIT_GOTO_EQUAL(i, 10, i, EXIT); // 10, here assert the result.
return (void *)i;
return reinterpret_cast<void *>(i);
EXIT:
return NULL;
}
@@ -132,7 +132,7 @@ static void *ThreadFunc6(void *arg)
ICUNIT_GOTO_EQUAL(g_pthreadTestCount, 12, g_pthreadTestCount, EXIT); // 12, here assert the result.
g_pthreadTestCount++; // 13
return (void *)pthread_self();
return reinterpret_cast<void *>(pthread_self());
EXIT:
return NULL;

View File

@@ -163,7 +163,7 @@ static void *ThreadFunc4(void *arg)
ret = pthread_cancel(pthread);
}
}
return (void *)i;
return reinterpret_cast<void *>(i);
EXIT:
return NULL;
@@ -196,7 +196,7 @@ static void *ThreadFunc3(void *arg)
}
ICUNIT_GOTO_EQUAL(i, 10, i, EXIT); // 10, here assert the result.
return (void *)i;
return reinterpret_cast<void *>(i);
EXIT:
return NULL;

View File

@@ -42,11 +42,11 @@
static inline int Syscall(int nbr, int parm1, int parm2, int parm3, int parm4)
{
register int reg7 __asm__("r7") = (int)(nbr);
register int reg3 __asm__("r3") = (int)(parm4);
register int reg2 __asm__("r2") = (int)(parm3);
register int reg1 __asm__("r1") = (int)(parm2);
register int reg0 __asm__("r0") = (int)(parm1);
register int reg7 __asm__("r7") = nbr;
register int reg3 __asm__("r3") = parm4;
register int reg2 __asm__("r2") = parm3;
register int reg1 __asm__("r1") = parm2;
register int reg0 __asm__("r0") = parm1;
__asm__ __volatile__("svc 0" : "=r"(reg0) : "r"(reg7), "r"(reg0), "r"(reg1), "r"(reg2), "r"(reg3) : "memory");

View File

@@ -44,7 +44,7 @@ static void *Threadfunc(void *parm)
int err;
err = pthread_once(&g_onceCtrl, InitRoutine);
ICUNIT_GOTO_EQUAL(err, 0, err, EXIT);
return (void *)g_okStatus;
return reinterpret_cast<void *>(g_okStatus);
EXIT:
return NULL;
}

View File

@@ -77,7 +77,7 @@ static int GroupProcess(void)
stackSize = 3000; // 3000, change stackSize, test again.
pthread_attr_init(&attr);
stack = (void *)0x1000;
stack = reinterpret_cast<void *>(0x1000);
ret = pthread_attr_setstack(&attr, stack, stackSize);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);