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

fix: 内核告警修复

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

【修改方案】
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
Download Patch File Download Diff File Expand all files Collapse all files

24
testsuites/unittest/net/resolv/smoke/net_resolv_test_001.cpp
View File

@@ -47,32 +47,32 @@ static int DnCompTest(void)
unsigned char **lastdnptr = &dnptrs[6];
int offset, ret;
offset = strlen((const char *)dnptrs[0])+1;
ret = dn_comp("x.y.z.example.com", comp_dn+offset, sizeof(comp_dn)-offset, dnptrs, lastdnptr);
dump(comp_dn+offset, ret);
offset = strlen(reinterpret_cast<const char *>(dnptrs[0]))+1;
ret = dn_comp("x.y.z.example.com", comp_dn + offset, sizeof(comp_dn) - offset, dnptrs, lastdnptr);
dump(comp_dn + offset, ret);
ICUNIT_ASSERT_EQUAL(ret, 19, ret);
ICUNIT_ASSERT_EQUAL(dnptrs[1], comp_dn+offset, dnptrs[1]);
ICUNIT_ASSERT_EQUAL(dnptrs[1], comp_dn + offset, dnptrs[1]);
offset += ret+1;
ret = dn_comp("zz.example.com", comp_dn+offset, sizeof(comp_dn)-offset, dnptrs, lastdnptr);
ret = dn_comp("zz.example.com", comp_dn + offset, sizeof(comp_dn) - offset, dnptrs, lastdnptr);
dump(comp_dn+offset, ret);
ICUNIT_ASSERT_EQUAL(ret, 5, ret);
ICUNIT_ASSERT_EQUAL(dnptrs[2], comp_dn+offset, dnptrs[2]);
ICUNIT_ASSERT_EQUAL(dnptrs[2], comp_dn + offset, dnptrs[2]);
offset += ret+1;
ret = dn_comp("a.example.com", comp_dn+offset, sizeof(comp_dn)-offset, dnptrs, lastdnptr);
ret = dn_comp("a.example.com", comp_dn + offset, sizeof(comp_dn) - offset, dnptrs, lastdnptr);
dump(comp_dn+offset, ret);
ICUNIT_ASSERT_EQUAL(ret, 4, ret);
ICUNIT_ASSERT_EQUAL(dnptrs[3], comp_dn+offset, dnptrs[3]);
ICUNIT_ASSERT_EQUAL(dnptrs[3], comp_dn + offset, dnptrs[3]);
offset += ret+1;
ret = dn_comp("example.com.cn", comp_dn+offset, sizeof(comp_dn)-offset, dnptrs, lastdnptr);
ret = dn_comp("example.com.cn", comp_dn + offset, sizeof(comp_dn) - offset, dnptrs, lastdnptr);
dump(comp_dn+offset, ret);
ICUNIT_ASSERT_EQUAL(ret, 16, ret);
ICUNIT_ASSERT_EQUAL(dnptrs[4], comp_dn+offset, dnptrs[4]);
ICUNIT_ASSERT_EQUAL(dnptrs[4], comp_dn + offset, dnptrs[4]);
offset += ret+1;
ret = dn_comp("2example.com", comp_dn+offset, sizeof(comp_dn)-offset, dnptrs, lastdnptr);
ret = dn_comp("2example.com", comp_dn + offset, sizeof(comp_dn) - offset, dnptrs, lastdnptr);
dump(comp_dn+offset, ret);
ICUNIT_ASSERT_EQUAL(ret, 11, ret);
ICUNIT_ASSERT_EQUAL(dnptrs[5], /*comp_dn+offset*/ NULL, dnptrs[5]); //last one is always NULL
@@ -80,7 +80,7 @@ static int DnCompTest(void)
for (int i = 0; i < 6; ++i) {
printf("%p: %s\n", dnptrs[i], dnptrs[i]);
}
ICUNIT_ASSERT_EQUAL(offset+ret<100, 1, ret);
ICUNIT_ASSERT_EQUAL(offset + ret < 100, 1, ret);
return ICUNIT_SUCCESS;
}

8
testsuites/unittest/net/socket/smoke/net_socket_test_002.cpp
View File

@@ -64,7 +64,7 @@ static int UdpTest(void)
srvAddr.sin_family = AF_INET;
srvAddr.sin_addr.s_addr = inet_addr(STACK_IP);
srvAddr.sin_port = htons(STACK_PORT);
ret = bind(sfd, (struct sockaddr*)&srvAddr, sizeof(srvAddr));
ret = bind(sfd, reinterpret_cast<struct sockaddr *>(&srvAddr), sizeof(srvAddr));
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
/* send */
@@ -75,14 +75,14 @@ static int UdpTest(void)
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ret = strcpy_s(g_buf, BUF_SIZE, MSG);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ret = sendto(sfd, g_buf, strlen(MSG), 0, (struct sockaddr*)&clnAddr,
(socklen_t)sizeof(clnAddr));
ret = sendto(sfd, g_buf, strlen(MSG), 0, reinterpret_cast<struct sockaddr *>(&clnAddr),
static_cast<socklen_t>(sizeof(clnAddr)));
ICUNIT_ASSERT_NOT_EQUAL(ret, -1, ret);
/* recv */
ret = memset_s(g_buf, BUF_SIZE, 0, BUF_SIZE);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ret = recvfrom(sfd, g_buf, sizeof(g_buf), 0, (struct sockaddr*)&clnAddr,
ret = recvfrom(sfd, g_buf, sizeof(g_buf), 0, reinterpret_cast<struct sockaddr *>(&clnAddr),
&clnAddrLen);
ICUNIT_ASSERT_EQUAL(ret, strlen(MSG), ret);

26
testsuites/unittest/net/socket/smoke/net_socket_test_003.cpp
View File

@@ -68,7 +68,7 @@ static int SampleTcpServer()
srvAddr.sin_family = AF_INET;
srvAddr.sin_addr.s_addr = inet_addr(STACK_IP);
srvAddr.sin_port = htons(STACK_PORT);
ret = bind(lsfd, (struct sockaddr*)&srvAddr, sizeof(srvAddr));
ret = bind(lsfd, reinterpret_cast<struct sockaddr *>(&srvAddr), sizeof(srvAddr));
LogPrintln("bind socket %d to %s:%d: %d", lsfd, inet_ntoa(srvAddr.sin_addr), ntohs(srvAddr.sin_port), ret);
ICUNIT_ASSERT_EQUAL(ret, 0, Wait() + ret);
@@ -78,7 +78,7 @@ static int SampleTcpServer()
Wait();
sfd = accept(lsfd, (struct sockaddr*)&clnAddr, &clnAddrLen);
sfd = accept(lsfd, reinterpret_cast<struct sockaddr *>(&clnAddr), &clnAddrLen);
LogPrintln("accept socket %d: %d <%s:%d>", lsfd, sfd, inet_ntoa(clnAddr.sin_addr), ntohs(clnAddr.sin_port));
ICUNIT_ASSERT_NOT_EQUAL(sfd, -1, sfd);
@@ -175,25 +175,27 @@ static int SampleTcpClient()
srvAddr.sin_family = AF_INET;
srvAddr.sin_addr.s_addr = inet_addr(PEER_IP);
srvAddr.sin_port = htons(PEER_PORT);
ret = connect(sfd, (struct sockaddr*)&srvAddr, sizeof(srvAddr));
ret = connect(sfd, reinterpret_cast<struct sockaddr *>(&srvAddr), sizeof(srvAddr));
LogPrintln("connect socket %d to %s:%d: %d", sfd, inet_ntoa(srvAddr.sin_addr), ntohs(srvAddr.sin_port), ret);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
/* test getpeername */
ret = getpeername(sfd, &addr, &addrLen);
LogPrintln("getpeername %d %s:%d: %d", sfd, inet_ntoa(((struct sockaddr_in*)&addr)->sin_addr), ntohs(((struct sockaddr_in*)&addr)->sin_port), ret);
LogPrintln("getpeername %d %s:%d: %d", sfd, inet_ntoa((reinterpret_cast<struct sockaddr_in *>(&addr))->sin_addr),
ntohs((reinterpret_cast<struct sockaddr_in *>(&addr))->sin_port), ret);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ICUNIT_ASSERT_EQUAL(addrLen, sizeof(struct sockaddr_in), addrLen);
ICUNIT_ASSERT_EQUAL(((struct sockaddr_in*)&addr)->sin_addr.s_addr,
inet_addr(PEER_IP), ((struct sockaddr_in*)&addr)->sin_addr.s_addr);
ICUNIT_ASSERT_EQUAL((reinterpret_cast<struct sockaddr_in *>(&addr))->sin_addr.s_addr,
inet_addr(PEER_IP), (static_cast<struct sockaddr_in *>(&addr))->sin_addr.s_addr);
/* test getsockname */
ret = getsockname(sfd, &addr, &addrLen);
LogPrintln("getsockname %d %s:%d: %d", sfd, inet_ntoa(((struct sockaddr_in*)&addr)->sin_addr), ntohs(((struct sockaddr_in*)&addr)->sin_port), ret);
LogPrintln("getsockname %d %s:%d: %d", sfd, inet_ntoa((reinterpret_cast<struct sockaddr_in *>(&addr))->sin_addr),
ntohs((reinterpret_cast<struct sockaddr_in *>(&addr))->sin_port), ret);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ICUNIT_ASSERT_EQUAL(addrLen, sizeof(struct sockaddr_in), addrLen);
ICUNIT_ASSERT_EQUAL(((struct sockaddr_in*)&addr)->sin_addr.s_addr,
inet_addr(STACK_IP), ((struct sockaddr_in*)&addr)->sin_addr.s_addr);
ICUNIT_ASSERT_EQUAL((reinterpret_cast<struct sockaddr_in *>(&addr))->sin_addr.s_addr,
inet_addr(STACK_IP), (static_cast<struct sockaddr_in *>(&addr))->sin_addr.s_addr);
/* send */
ret = memset_s(gBuf, BUF_SIZE + 1, 0, BUF_SIZE + 1);
@@ -267,13 +269,13 @@ static int SampleTcpClient()
static void* TcpServerRoutine(void *p)
{
int ret = SampleTcpServer();
return (void*)(intptr_t)ret;
return reinterpret_cast<void *>(ret);
}
static void* TcpClientRoutine(void *p)
{
int ret = SampleTcpClient();
return (void*)(intptr_t)ret;
return reinterpret_cast<void *>(ret);
}
static int TcpTest()
@@ -312,7 +314,7 @@ static int TcpTest()
ret = pthread_barrier_destroy(&gBarrier);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
return (int)(intptr_t)(sret) + (int)(intptr_t)(cret);
return static_cast<int>(reinterpret_cast<intptr_t>(sret)) + static_cast<int>(reinterpret_cast<intptr_t>(cret));
}
void NetSocketTest003(void)

74
testsuites/unittest/net/socket/smoke/net_socket_test_007.cpp
View File

@@ -45,90 +45,100 @@ static int TcpTest()
lsfd = socket(AF_INET, SOCK_STREAM, 0);
ICUNIT_ASSERT_NOT_EQUAL(lsfd, -1, lsfd);
ret = bind(lsfd, (const struct sockaddr *)INVALID_USER_ADDR, sizeof(struct sockaddr_in));
ret = bind(lsfd, reinterpret_cast<const struct sockaddr *>(INVALID_USER_ADDR), sizeof(struct sockaddr_in));
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ret = bind(lsfd, (const struct sockaddr *)INVALID_KERNEL_ADDR, sizeof(struct sockaddr_in));
ret = bind(lsfd, reinterpret_cast<const struct sockaddr *>(INVALID_KERNEL_ADDR), sizeof(struct sockaddr_in));
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ret = connect(lsfd, (struct sockaddr*)INVALID_USER_ADDR, sizeof(struct sockaddr_in));
ret = connect(lsfd, reinterpret_cast<struct sockaddr *>(INVALID_USER_ADDR), sizeof(struct sockaddr_in));
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ret = connect(lsfd, (struct sockaddr*)INVALID_KERNEL_ADDR, sizeof(struct sockaddr_in));
ret = connect(lsfd, reinterpret_cast<struct sockaddr *>(INVALID_KERNEL_ADDR), sizeof(struct sockaddr_in));
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ret = accept(lsfd, (struct sockaddr*)INVALID_USER_ADDR, (socklen_t *)INVALID_USER_ADDR);
ret = accept(lsfd, reinterpret_cast<struct sockaddr *>(INVALID_USER_ADDR),
reinterpret_cast<socklen_t *>(INVALID_USER_ADDR));
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ret = accept(lsfd, (struct sockaddr*)INVALID_KERNEL_ADDR, (socklen_t *)INVALID_KERNEL_ADDR);
ret = accept(lsfd, reinterpret_cast<struct sockaddr *>(INVALID_KERNEL_ADDR),
reinterpret_cast<socklen_t *>(INVALID_KERNEL_ADDR));
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ret = getsockname(lsfd, (struct sockaddr*)INVALID_USER_ADDR, (socklen_t *)INVALID_USER_ADDR);
ret = getsockname(lsfd, reinterpret_cast<struct sockaddr *>(INVALID_USER_ADDR),
reinterpret_cast<socklen_t *>(INVALID_USER_ADDR));
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ret = getsockname(lsfd, (struct sockaddr*)INVALID_KERNEL_ADDR, (socklen_t *)INVALID_KERNEL_ADDR);
ret = getsockname(lsfd, reinterpret_cast<struct sockaddr *>(INVALID_KERNEL_ADDR),
reinterpret_cast<socklen_t *>(INVALID_KERNEL_ADDR));
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ret = getpeername(lsfd, (struct sockaddr*)INVALID_USER_ADDR, (socklen_t *)INVALID_USER_ADDR);
ret = getpeername(lsfd, reinterpret_cast<struct sockaddr *>(INVALID_USER_ADDR),
reinterpret_cast<socklen_t *>(INVALID_USER_ADDR));
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ret = getpeername(lsfd, (struct sockaddr*)INVALID_KERNEL_ADDR, (socklen_t *)INVALID_KERNEL_ADDR);
ret = getpeername(lsfd, reinterpret_cast<struct sockaddr *>(INVALID_KERNEL_ADDR),
reinterpret_cast<socklen_t *>(INVALID_KERNEL_ADDR));
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ret = send(lsfd, (char *)INVALID_USER_ADDR, strlen(SRV_MSG), 0);
ret = send(lsfd, reinterpret_cast<char *>(INVALID_USER_ADDR), strlen(SRV_MSG), 0);
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ret = send(lsfd, (char *)INVALID_KERNEL_ADDR, strlen(SRV_MSG), 0);
ret = send(lsfd, reinterpret_cast<char *>(INVALID_KERNEL_ADDR), strlen(SRV_MSG), 0);
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ret = sendto(lsfd, (char *)INVALID_USER_ADDR, strlen(SRV_MSG), 0, (struct sockaddr*)INVALID_USER_ADDR,
(socklen_t)sizeof(struct sockaddr_in));
ret = sendto(lsfd, reinterpret_cast<char *>(INVALID_USER_ADDR), strlen(SRV_MSG), 0,
reinterpret_cast<struct sockaddr *>(INVALID_USER_ADDR), static_cast<socklen_t>(sizeof(struct sockaddr_in)));
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ret = sendto(lsfd, (char *)INVALID_KERNEL_ADDR, strlen(SRV_MSG), 0, (struct sockaddr*)INVALID_KERNEL_ADDR,
(socklen_t)sizeof(struct sockaddr_in));
ret = sendto(lsfd, reinterpret_cast<char *>(INVALID_KERNEL_ADDR), strlen(SRV_MSG), 0,
reinterpret_cast<struct sockaddr *>(INVALID_KERNEL_ADDR), static_cast<socklen_t>(sizeof(struct sockaddr_in)));
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ret = recv(lsfd, (char *)INVALID_USER_ADDR, sizeof(SRV_MSG), 0);
ret = recv(lsfd, reinterpret_cast<char *>(INVALID_USER_ADDR), sizeof(SRV_MSG), 0);
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ret = recv(lsfd, (char *)INVALID_KERNEL_ADDR, sizeof(SRV_MSG), 0);
ret = recv(lsfd, reinterpret_cast<char *>(INVALID_KERNEL_ADDR), sizeof(SRV_MSG), 0);
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ret = recvfrom(lsfd, (char *)INVALID_USER_ADDR, sizeof(SRV_MSG), 0, (struct sockaddr*)INVALID_USER_ADDR,
(socklen_t *)INVALID_USER_ADDR);
ret = recvfrom(lsfd, reinterpret_cast<char *>(INVALID_USER_ADDR), sizeof(SRV_MSG), 0,
reinterpret_cast<struct sockaddr *>(INVALID_USER_ADDR), reinterpret_cast<socklen_t *>(INVALID_USER_ADDR));
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ret = recvfrom(lsfd, (char *)INVALID_KERNEL_ADDR, sizeof(SRV_MSG), 0, (struct sockaddr*)INVALID_KERNEL_ADDR,
(socklen_t *)INVALID_KERNEL_ADDR);
ret = recvfrom(lsfd, reinterpret_cast<char *>(INVALID_KERNEL_ADDR), sizeof(SRV_MSG), 0,
reinterpret_cast<struct sockaddr *>(INVALID_KERNEL_ADDR), reinterpret_cast<socklen_t *>(INVALID_KERNEL_ADDR));
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ret = setsockopt(lsfd, SOL_SOCKET, SO_RCVTIMEO, (struct timeval *)INVALID_USER_ADDR, (socklen_t)sizeof(struct timeval));
ret = setsockopt(lsfd, SOL_SOCKET, SO_RCVTIMEO, reinterpret_cast<struct timeval *>(INVALID_USER_ADDR),
static_cast<socklen_t>(sizeof(struct timeval)));
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ret = setsockopt(lsfd, SOL_SOCKET, SO_RCVTIMEO, (struct timeval *)INVALID_KERNEL_ADDR, (socklen_t)sizeof(struct timeval));
ret = setsockopt(lsfd, SOL_SOCKET, SO_RCVTIMEO, reinterpret_cast<struct timeval *>(INVALID_KERNEL_ADDR),
static_cast<socklen_t>(sizeof(struct timeval)));
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ret = getsockopt(lsfd, SOL_SOCKET, SO_RCVTIMEO, (struct timeval *)INVALID_USER_ADDR, (socklen_t*)sizeof(struct timeval));
ret = getsockopt(lsfd, SOL_SOCKET, SO_RCVTIMEO, reinterpret_cast<struct timeval *>(INVALID_USER_ADDR),
reinterpret_cast<socklen_t *>(sizeof(struct timeval)));
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ret = getsockopt(lsfd, SOL_SOCKET, SO_RCVTIMEO, (struct timeval *)INVALID_KERNEL_ADDR, (socklen_t*)sizeof(struct timeval));
ret = getsockopt(lsfd, SOL_SOCKET, SO_RCVTIMEO, reinterpret_cast<struct timeval *>(INVALID_KERNEL_ADDR),
reinterpret_cast<socklen_t *>(sizeof(struct timeval)));
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ret = sendmsg(lsfd, (struct msghdr *)INVALID_USER_ADDR, 0);
ret = sendmsg(lsfd, reinterpret_cast<struct msghdr *>(INVALID_USER_ADDR), 0);
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ret = sendmsg(lsfd, (struct msghdr *)INVALID_KERNEL_ADDR, 0);
ret = sendmsg(lsfd, reinterpret_cast<struct msghdr *>(INVALID_KERNEL_ADDR), 0);
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
msg.msg_name = (char *)INVALID_USER_ADDR;
msg.msg_name = reinterpret_cast<char *>(INVALID_USER_ADDR);
msg.msg_namelen = sizeof(struct sockaddr_in);
msg.msg_iov = (struct iovec *)INVALID_KERNEL_ADDR;
msg.msg_iov = reinterpret_cast<struct iovec *>(INVALID_KERNEL_ADDR);
msg.msg_iovlen = 2;
ret = recvmsg(lsfd, (struct msghdr *)&msg, 0);
ret = recvmsg(lsfd, static_cast<struct msghdr *>(&msg), 0);
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ret = recvmsg(lsfd, (struct msghdr *)&msg, 0);
ret = recvmsg(lsfd, static_cast<struct msghdr *>(&msg), 0);
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
#ifdef TEST_BIG_MEM

6
testsuites/unittest/net/socket/smoke/net_socket_test_008.cpp
View File

@@ -121,7 +121,7 @@ static int HandleAccept(int lsfd)
{
struct sockaddr_in sa;
int saLen = sizeof(sa);
int fd = accept(lsfd, (struct sockaddr *)&sa, (socklen_t *)&saLen);
int fd = accept(lsfd, reinterpret_cast<struct sockaddr *>(&sa), reinterpret_cast<socklen_t *>(&saLen));
if (fd == INVALID_SOCKET) {
perror("accept");
return -1;
@@ -168,7 +168,7 @@ static void *ClientsThread(void *param)
sa.sin_family = AF_INET;
sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
sa.sin_port = htons(SERVER_PORT);
if (connect(fd, (struct sockaddr *)&sa, sizeof(sa)) == -1) {
if (connect(fd, reinterpret_cast<struct sockaddr *>(&sa), sizeof(sa)) == -1) {
perror("connect");
return NULL;
}
@@ -224,7 +224,7 @@ static int SelectTest(void)
sa.sin_family = AF_INET;
sa.sin_addr.s_addr = htonl(INADDR_ANY);
sa.sin_port = htons(SERVER_PORT);
ret = bind(lsfd, (struct sockaddr *)&sa, sizeof(sa));
ret = bind(lsfd, reinterpret_cast<struct sockaddr *>(&sa), sizeof(sa));
ICUNIT_ASSERT_NOT_EQUAL(ret, -1, errno + CloseAllFd());
ret = listen(lsfd, BACKLOG);

6
testsuites/unittest/net/socket/smoke/net_socket_test_009.cpp
View File

@@ -120,7 +120,7 @@ static int HandleAccept(int lsfd)
{
struct sockaddr_in sa;
int saLen = sizeof(sa);
int fd = accept(lsfd, (struct sockaddr *)&sa, (socklen_t *)&saLen);
int fd = accept(lsfd, reinterpret_cast<struct sockaddr *>(&sa), reinterpret_cast<socklen_t *>(&saLen));
if (fd == INVALID_SOCKET) {
perror("accept");
return -1;
@@ -168,7 +168,7 @@ static void *ClientsThread(void *param)
sa.sin_family = AF_INET;
sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
sa.sin_port = htons(SERVER_PORT);
if (connect(fd, (struct sockaddr *)&sa, sizeof(sa)) == -1) {
if (connect(fd, reinterpret_cast<struct sockaddr *>(&sa), sizeof(sa)) == -1) {
perror("connect");
return NULL;
}
@@ -224,7 +224,7 @@ static int PollTest(void)
sa.sin_family = AF_INET;
sa.sin_addr.s_addr = htonl(INADDR_ANY);
sa.sin_port = htons(SERVER_PORT);
ret = bind(lsfd, (struct sockaddr *)&sa, sizeof(sa));
ret = bind(lsfd, reinterpret_cast<struct sockaddr *>(&sa), sizeof(sa));
ICUNIT_ASSERT_NOT_EQUAL(ret, -1, errno + CloseAllFd());
ret = listen(lsfd, BACKLOG);

4
testsuites/unittest/net/socket/smoke/net_socket_test_010.cpp
View File

@@ -117,11 +117,11 @@ static int IoctlTestInternal(int sfd)
LogPrintln("ifindex %u: %s", lanIndex, p);
ICUNIT_ASSERT_NOT_EQUAL(p, NULL, errno);
ret = strncpy_s(gDefaultNetif, sizeof(gDefaultNetif) -1, p, sizeof(gDefaultNetif) - 1);
ret = strncpy_s(gDefaultNetif, sizeof(gDefaultNetif) - 1, p, sizeof(gDefaultNetif) - 1);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
gDefaultNetif[sizeof(gDefaultNetif) - 1] = '\0';
ret = (int)IfName2Index(sfd, p);
ret = static_cast<int>(IfName2Index(sfd, p));
LogPrintln("index of %s: %d", p, ret);
ICUNIT_ASSERT_NOT_EQUAL(ret, 0, errno);

4
testsuites/unittest/net/socket/smoke/net_socket_test_011.cpp
View File

@@ -143,7 +143,7 @@ static void *ClientsThread(void *param)
sa.sin_family = AF_INET;
sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
sa.sin_port = htons(SERVER_PORT);
if (connect(fd, (struct sockaddr *)&sa, sizeof(sa)) == -1) {
if (connect(fd, reinterpret_cast<struct sockaddr *>(&sa), sizeof(sa)) == -1) {
perror("connect");
return NULL;
}
@@ -204,7 +204,7 @@ static int UdpSelectTest(void)
sa.sin_family = AF_INET;
sa.sin_addr.s_addr = htonl(INADDR_ANY);
sa.sin_port = htons(SERVER_PORT);
ret = bind(lsfd, (struct sockaddr *)&sa, sizeof(sa));
ret = bind(lsfd, reinterpret_cast<struct sockaddr *>(&sa), sizeof(sa));
ICUNIT_ASSERT_NOT_EQUAL(ret, -1, errno + CloseAllFd());
InitFds();

20
testsuites/unittest/net/socket/smoke/net_socket_test_012.cpp
View File

@@ -43,11 +43,11 @@ static int SocketNullTestInternal(int sfd)
{
int ret;
struct sockaddr addr = {0};
struct sockaddr *bad = (struct sockaddr *)0xbad;
struct sockaddr *bad = reinterpret_cast<struct sockaddr *>(0xbad);
socklen_t addrlen = sizeof(addr);
socklen_t zero = 0;
struct msghdr message = {0};
void *badUserAddr = (void*)0x3effffff;
void *badUserAddr = reinterpret_cast<void *>(0x3effffff);
/**
* accept
@@ -216,13 +216,13 @@ static int SocketNullTestInternal(int sfd)
LogPrintln("recvmsg: %d, errno=%d", ret, errno);
ICUNIT_ASSERT_EQUAL(ret, -1, errno);
message.msg_iov = (struct iovec *)((void *)0xbad);
message.msg_iov = reinterpret_cast<struct iovec *>(0xbad);
message.msg_iovlen = 1;
ret = recvmsg(sfd, &message, MSG_DONTWAIT);
LogPrintln("recvmsg: %d, errno=%d", ret, errno);
ICUNIT_ASSERT_EQUAL(ret, -1, errno);
message.msg_iov = (struct iovec *)((void *)0xbad);
message.msg_iov = reinterpret_cast<struct iovec *>(0xbad);
message.msg_iovlen = 0;
ret = recvmsg(sfd, &message, MSG_DONTWAIT);
LogPrintln("recvmsg: %d, errno=%d", ret, errno);
@@ -264,13 +264,13 @@ static int SocketNullTestInternal(int sfd)
LogPrintln("sendmsg: %d, errno=%d", ret, errno);
ICUNIT_ASSERT_EQUAL(ret, -1, errno);
message.msg_iov = (struct iovec *)0xbad;
message.msg_iov = reinterpret_cast<struct iovec *>(0xbad);
message.msg_iovlen = 1;
ret = sendmsg(sfd, &message, MSG_NOSIGNAL);
LogPrintln("sendmsg: %d, errno=%d", ret, errno);
ICUNIT_ASSERT_EQUAL(ret, -1, errno);
message.msg_iov = (struct iovec *)0xbad;
message.msg_iov = reinterpret_cast<struct iovec *>(0xbad);
message.msg_iovlen = 0;
ret = sendmsg(sfd, &message, MSG_NOSIGNAL);
LogPrintln("sendmsg: %d, errno=%d", ret, errno);
@@ -326,11 +326,11 @@ static int SocketNullTestInternal(int sfd)
LogPrintln("read: %d, errno=%d", ret, errno);
ICUNIT_ASSERT_EQUAL((ret == 0 || ret == -1), 1, errno);
ret = readv(sfd, (struct iovec *)bad, 0);
ret = readv(sfd, reinterpret_cast<struct iovec *>(bad), 0);
LogPrintln("readv: %d, errno=%d", ret, errno);
ICUNIT_ASSERT_EQUAL((ret == 0 || ret == -1), 1, errno);
ret = readv(sfd, (struct iovec *)bad, 1);
ret = readv(sfd, reinterpret_cast<struct iovec *>(bad), 1);
LogPrintln("readv: %d, errno=%d", ret, errno);
ICUNIT_ASSERT_EQUAL(ret, -1, errno);
@@ -377,11 +377,11 @@ static int SocketNullTestInternal(int sfd)
LogPrintln("write: %d, errno=%d", ret, errno);
ICUNIT_ASSERT_EQUAL((ret == 0 || ret == -1), 1, errno);
ret = writev(sfd, (struct iovec *)bad, 0);
ret = writev(sfd, reinterpret_cast<struct iovec *>(bad), 0);
LogPrintln("writev: %d, errno=%d", ret, errno);
ICUNIT_ASSERT_EQUAL((ret == 0 || ret == -1), 1, errno);
ret = writev(sfd, (struct iovec *)bad, 1);
ret = writev(sfd, reinterpret_cast<struct iovec *>(bad), 1);
LogPrintln("writev: %d, errno=%d", ret, errno);
ICUNIT_ASSERT_EQUAL(ret, -1, errno);

8
testsuites/unittest/net/socket/smoke/net_socket_test_013.cpp
View File

@@ -140,7 +140,7 @@ static unsigned int GetIp(int sfd, const char *ifname)
ifr.ifr_name[sizeof(ifr.ifr_name) - 1] = '\0';
ret = ioctl(sfd, SIOCGIFADDR, &ifr);
if (ret == 0) {
ip = ((struct sockaddr_in *)&(ifr.ifr_addr))->sin_addr.s_addr;
ip = (reinterpret_cast<struct sockaddr_in *>(&(ifr.ifr_addr)))->sin_addr.s_addr;
}
return ip;
}
@@ -156,7 +156,7 @@ static unsigned int GetNetmask(int sfd, const char *ifname)
ifr.ifr_name[sizeof(ifr.ifr_name) - 1] = '\0';
ret = ioctl(sfd, SIOCGIFNETMASK, &ifr);
if (ret == 0) {
msk = ((struct sockaddr_in *)&(ifr.ifr_addr))->sin_addr.s_addr;
msk = (reinterpret_cast<struct sockaddr_in *>(&(ifr.ifr_addr)))->sin_addr.s_addr;
}
return msk;
}
@@ -207,7 +207,7 @@ static void *ClientsThread(void *param)
sa.sin_family = AF_INET;
sa.sin_addr.s_addr = brdcast;
sa.sin_port = htons(SERVER_PORT);
if (connect(fd, (struct sockaddr *)&sa, sizeof(sa)) == -1) {
if (connect(fd, reinterpret_cast<struct sockaddr *>(&sa), sizeof(sa)) == -1) {
perror("connect");
return NULL;
}
@@ -263,7 +263,7 @@ static int UdpBrdcastSelectTest(void)
sa.sin_family = AF_INET;
sa.sin_addr.s_addr = htonl(INADDR_ANY);
sa.sin_port = htons(SERVER_PORT);
ret = bind(lsfd, (struct sockaddr *)&sa, sizeof(sa));
ret = bind(lsfd, reinterpret_cast<struct sockaddr *>(&sa), sizeof(sa));
ICUNIT_ASSERT_NOT_EQUAL(ret, -1, errno + CloseAllFd());
int broadcast = 1;