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

fix: kora工具检视问题修复

Browse Source 
【背景】kora工具检视问题修复

【修改方案】
1，对部分代码问题进行整改

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

Signed-off-by: wangchen <wangchen64@huawei.com>
Change-Id: Iafc58b7c71e5d139e11a0ae9d98ca5a57fc6549f
This commit is contained in:
wangchen
2022-03-22 12:52:03 +00:00
parent f61ecd7669
commit 6ba17fc862
40 changed files with 146 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,7 +83,7 @@ static int SampleTcpServer()
ICUNIT_ASSERT_NOT_EQUAL(sfd, -1, sfd);
/* send */
ret = memset_s(gBuf, BUF_SIZE - 1, 0, BUF_SIZE - 1);
ret = memset_s(gBuf, BUF_SIZE + 1, 0, BUF_SIZE + 1);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
gBuf[BUF_SIZE - 1] = '\0';
ret = strcpy_s(gBuf, BUF_SIZE - 1, SRV_MSG);
@@ -94,7 +94,7 @@ static int SampleTcpServer()
ICUNIT_ASSERT_EQUAL(ret, strlen(SRV_MSG), ret);
/* recv */
ret = memset_s(gBuf, BUF_SIZE - 1, 0, BUF_SIZE - 1);
ret = memset_s(gBuf, BUF_SIZE + 1, 0, BUF_SIZE + 1);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
gBuf[BUF_SIZE - 1] = '\0';
ret = recv(sfd, gBuf, sizeof(gBuf), 0);
@@ -107,7 +107,7 @@ static int SampleTcpServer()
clnAddr.sin_family = AF_INET;
clnAddr.sin_addr.s_addr = inet_addr(PEER_IP);
clnAddr.sin_port = htons(PEER_PORT);
ret = memset_s(gBuf, BUF_SIZE - 1, 0, BUF_SIZE - 1);
ret = memset_s(gBuf, BUF_SIZE + 1, 0, BUF_SIZE + 1);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
gBuf[BUF_SIZE - 1] = '\0';
ret = strcpy_s(gBuf, BUF_SIZE - 1, SRV_MSG);
@@ -128,7 +128,7 @@ static int SampleTcpServer()
Wait();
/* recvmsg */
ret = memset_s(gBuf, BUF_SIZE - 1, 0, BUF_SIZE - 1);
ret = memset_s(gBuf, BUF_SIZE + 1, 0, BUF_SIZE + 1);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
gBuf[BUF_SIZE - 1] = '\0';
ret = memset_s(&msg, sizeof(msg), 0, sizeof(msg));
@@ -196,7 +196,7 @@ static int SampleTcpClient()
inet_addr(STACK_IP), ((struct sockaddr_in*)&addr)->sin_addr.s_addr);
/* send */
ret = memset_s(gBuf, BUF_SIZE - 1, 0, BUF_SIZE - 1);
ret = memset_s(gBuf, BUF_SIZE + 1, 0, BUF_SIZE + 1);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
gBuf[BUF_SIZE - 1] = '\0';
ret = strcpy_s(gBuf, BUF_SIZE - 1, CLI_MSG);
@@ -207,7 +207,7 @@ static int SampleTcpClient()
ICUNIT_ASSERT_EQUAL(ret, strlen(CLI_MSG), ret);
/* recv */
ret = memset_s(gBuf, BUF_SIZE - 1, 0, BUF_SIZE - 1);
ret = memset_s(gBuf, BUF_SIZE + 1, 0, BUF_SIZE + 1);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
gBuf[BUF_SIZE - 1] = '\0';
ret = recv(sfd, gBuf, sizeof(gBuf), 0);
@@ -220,7 +220,7 @@ static int SampleTcpClient()
clnAddr.sin_family = AF_INET;
clnAddr.sin_addr.s_addr = inet_addr(PEER_IP);
clnAddr.sin_port = htons(PEER_PORT);
ret = memset_s(gBuf, BUF_SIZE - 1, 0, BUF_SIZE - 1);
ret = memset_s(gBuf, BUF_SIZE + 1, 0, BUF_SIZE + 1);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
gBuf[BUF_SIZE - 1] = '\0';
ret = strcpy_s(gBuf, BUF_SIZE - 1, CLI_MSG);
@@ -241,7 +241,7 @@ static int SampleTcpClient()
Wait();
/* recvmsg */
ret = memset_s(gBuf, BUF_SIZE - 1, 0, BUF_SIZE - 1);
ret = memset_s(gBuf, BUF_SIZE + 1, 0, BUF_SIZE + 1);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
gBuf[BUF_SIZE - 1] = '\0';
ret = memset_s(&msg, sizeof(msg), 0, sizeof(msg));

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

@@ -139,13 +139,17 @@ static int TcpTest()
} else {
printf("malloc 20M success\n");
ret = memset_s(buf, bufSiz, 0, bufSiz);
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT);
ret = send(lsfd, buf, bufSiz, 0);
printf("send ret = %d, errno :%d\n", ret, errno);
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
ICUNIT_GOTO_EQUAL(ret, -1, ret, EXIT);
}
EXIT:
if (buf != NULL) {
free(buf);
}
#endif
close(lsfd);
return 0;
}