examples/usrsocktest: Fix error: variable 'ret' set but not used
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
diff --git a/examples/usrsocktest/usrsocktest_basic_daemon.c b/examples/usrsocktest/usrsocktest_basic_daemon.c
index 6387f77..29b86f8 100644
--- a/examples/usrsocktest/usrsocktest_basic_daemon.c
+++ b/examples/usrsocktest/usrsocktest_basic_daemon.c
@@ -506,25 +506,25 @@
if (sd >= 0)
{
ret = close(sd);
- assert(ret >= 0);
+ TEST_ASSERT_TRUE(ret >= 0);
}
if (sd2 >= 0)
{
ret = close(sd2);
- assert(ret >= 0);
+ TEST_ASSERT_TRUE(ret >= 0);
}
if (sd3 >= 0)
{
ret = close(sd3);
- assert(ret >= 0);
+ TEST_ASSERT_TRUE(ret >= 0);
}
if (started)
{
ret = usrsocktest_daemon_stop();
- assert(ret == OK);
+ TEST_ASSERT_EQUAL(ret, OK);
}
}
diff --git a/examples/usrsocktest/usrsocktest_basic_getsockname.c b/examples/usrsocktest/usrsocktest_basic_getsockname.c
index c9bbd61..fd7810a 100644
--- a/examples/usrsocktest/usrsocktest_basic_getsockname.c
+++ b/examples/usrsocktest/usrsocktest_basic_getsockname.c
@@ -239,13 +239,13 @@
if (sd >= 0)
{
ret = close(sd);
- assert(ret >= 0);
+ TEST_ASSERT_TRUE(ret >= 0);
}
if (started)
{
ret = usrsocktest_daemon_stop();
- assert(ret == OK);
+ TEST_ASSERT_EQUAL(ret, OK);
}
}
diff --git a/examples/usrsocktest/usrsocktest_basic_getsockopt.c b/examples/usrsocktest/usrsocktest_basic_getsockopt.c
index b0ddd3c..2d1cf7c 100644
--- a/examples/usrsocktest/usrsocktest_basic_getsockopt.c
+++ b/examples/usrsocktest/usrsocktest_basic_getsockopt.c
@@ -218,13 +218,13 @@
if (sd >= 0)
{
ret = close(sd);
- assert(ret >= 0);
+ TEST_ASSERT_TRUE(ret >= 0);
}
if (started)
{
ret = usrsocktest_daemon_stop();
- assert(ret == OK);
+ TEST_ASSERT_EQUAL(ret, OK);
}
}
diff --git a/examples/usrsocktest/usrsocktest_basic_send.c b/examples/usrsocktest/usrsocktest_basic_send.c
index 0785708..9c87df5 100644
--- a/examples/usrsocktest/usrsocktest_basic_send.c
+++ b/examples/usrsocktest/usrsocktest_basic_send.c
@@ -295,13 +295,13 @@
if (sd >= 0)
{
ret = close(sd);
- assert(ret >= 0);
+ TEST_ASSERT_TRUE(ret >= 0);
}
if (started)
{
ret = usrsocktest_daemon_stop();
- assert(ret == OK);
+ TEST_ASSERT_EQUAL(ret, OK);
}
}
diff --git a/examples/usrsocktest/usrsocktest_basic_setsockopt.c b/examples/usrsocktest/usrsocktest_basic_setsockopt.c
index 4c10415..7798050 100644
--- a/examples/usrsocktest/usrsocktest_basic_setsockopt.c
+++ b/examples/usrsocktest/usrsocktest_basic_setsockopt.c
@@ -186,13 +186,13 @@
if (sd >= 0)
{
ret = close(sd);
- assert(ret >= 0);
+ TEST_ASSERT_TRUE(ret >= 0);
}
if (started)
{
ret = usrsocktest_daemon_stop();
- assert(ret == OK);
+ TEST_ASSERT_EQUAL(ret, OK);
}
}
diff --git a/examples/usrsocktest/usrsocktest_block_recv.c b/examples/usrsocktest/usrsocktest_block_recv.c
index c54cb8a..b2b10db 100644
--- a/examples/usrsocktest/usrsocktest_block_recv.c
+++ b/examples/usrsocktest/usrsocktest_block_recv.c
@@ -563,13 +563,13 @@
if (sd >= 0)
{
ret = close(sd);
- assert(ret >= 0);
+ TEST_ASSERT_TRUE(ret >= 0);
}
if (started)
{
ret = usrsocktest_daemon_stop();
- assert(ret == OK);
+ TEST_ASSERT_EQUAL(ret, OK);
}
}
diff --git a/examples/usrsocktest/usrsocktest_block_send.c b/examples/usrsocktest/usrsocktest_block_send.c
index 8d5eb42..84ad4e0 100644
--- a/examples/usrsocktest/usrsocktest_block_send.c
+++ b/examples/usrsocktest/usrsocktest_block_send.c
@@ -362,13 +362,13 @@
if (sd >= 0)
{
ret = close(sd);
- assert(ret >= 0);
+ TEST_ASSERT_TRUE(ret >= 0);
}
if (started)
{
ret = usrsocktest_daemon_stop();
- assert(ret == OK);
+ TEST_ASSERT_EQUAL(ret, OK);
}
}
diff --git a/examples/usrsocktest/usrsocktest_chardev.c b/examples/usrsocktest/usrsocktest_chardev.c
index 9cbd9f2..3377c74 100644
--- a/examples/usrsocktest/usrsocktest_chardev.c
+++ b/examples/usrsocktest/usrsocktest_chardev.c
@@ -102,13 +102,13 @@
if (us_fd >= 0)
{
ret = close(us_fd);
- assert(ret >= 0);
+ TEST_ASSERT_TRUE(ret >= 0);
}
if (us_fd_two >= 0)
{
ret = close(us_fd_two);
- assert(ret >= 0);
+ TEST_ASSERT_TRUE(ret >= 0);
}
}
diff --git a/examples/usrsocktest/usrsocktest_daemon.c b/examples/usrsocktest/usrsocktest_daemon.c
index 37303fe..74ba8eb 100644
--- a/examples/usrsocktest/usrsocktest_daemon.c
+++ b/examples/usrsocktest/usrsocktest_daemon.c
@@ -278,13 +278,13 @@
endpaddr = malloc(sizeof(*endpaddr));
usrsocktest_endp_malloc_cnt++;
- assert(endpaddr);
+ DEBUGASSERT(endpaddr != NULL);
ok = inet_pton(AF_INET, priv->conf->endpoint_addr,
&endpaddr->sin_addr.s_addr);
endpaddr->sin_family = AF_INET;
endpaddr->sin_port = htons(priv->conf->endpoint_port);
- assert(ok);
+ DEBUGASSERT(ok);
if (endpaddr->sin_addr.s_addr == ipaddr)
{
@@ -1600,8 +1600,8 @@
return -EIO;
}
- assert(handlers[common_hdr->reqid].hdrlen <
- (sizeof(hdrbuf) - sizeof(*common_hdr)));
+ DEBUGASSERT(handlers[common_hdr->reqid].hdrlen <
+ sizeof(hdrbuf) - sizeof(*common_hdr));
rlen = read_req(fd, common_hdr, hdrbuf,
handlers[common_hdr->reqid].hdrlen);
diff --git a/examples/usrsocktest/usrsocktest_multi_thread.c b/examples/usrsocktest/usrsocktest_multi_thread.c
index a233f3e..8291ada 100644
--- a/examples/usrsocktest/usrsocktest_multi_thread.c
+++ b/examples/usrsocktest/usrsocktest_multi_thread.c
@@ -152,9 +152,9 @@
if (tids[i] != -1)
{
ret = pthread_cancel(tids[i]);
- assert(ret == OK);
+ TEST_ASSERT_EQUAL(ret, OK);
ret = pthread_join(tids[i], NULL);
- assert(ret == OK);
+ TEST_ASSERT_EQUAL(ret, OK);
}
}
@@ -163,14 +163,14 @@
if (sds[i] != -1)
{
ret = close(sds[i]);
- assert(ret >= 0);
+ TEST_ASSERT_TRUE(ret >= 0);
}
}
if (started)
{
ret = usrsocktest_daemon_stop();
- assert(ret == OK);
+ TEST_ASSERT_EQUAL(ret, OK);
}
}
diff --git a/examples/usrsocktest/usrsocktest_noblock_connect.c b/examples/usrsocktest/usrsocktest_noblock_connect.c
index ac9ac91..758bd08 100644
--- a/examples/usrsocktest/usrsocktest_noblock_connect.c
+++ b/examples/usrsocktest/usrsocktest_noblock_connect.c
@@ -77,19 +77,19 @@
if (sd >= 0)
{
ret = close(sd);
- assert(ret == 0);
+ TEST_ASSERT_EQUAL(ret, 0);
}
if (sd2 >= 0)
{
ret = close(sd2);
- assert(ret == 0);
+ TEST_ASSERT_EQUAL(ret, 0);
}
if (started)
{
ret = usrsocktest_daemon_stop();
- assert(ret == OK);
+ TEST_ASSERT_EQUAL(ret, OK);
}
}
diff --git a/examples/usrsocktest/usrsocktest_noblock_recv.c b/examples/usrsocktest/usrsocktest_noblock_recv.c
index a2e4cbf..b75cf37 100644
--- a/examples/usrsocktest/usrsocktest_noblock_recv.c
+++ b/examples/usrsocktest/usrsocktest_noblock_recv.c
@@ -465,13 +465,13 @@
if (sd >= 0)
{
ret = close(sd);
- assert(ret >= 0);
+ TEST_ASSERT_TRUE(ret >= 0);
}
if (started)
{
ret = usrsocktest_daemon_stop();
- assert(ret == OK);
+ TEST_ASSERT_EQUAL(ret, OK);
}
}
diff --git a/examples/usrsocktest/usrsocktest_noblock_send.c b/examples/usrsocktest/usrsocktest_noblock_send.c
index 7a817d7..140a6d5 100644
--- a/examples/usrsocktest/usrsocktest_noblock_send.c
+++ b/examples/usrsocktest/usrsocktest_noblock_send.c
@@ -355,13 +355,13 @@
if (sd >= 0)
{
ret = close(sd);
- assert(ret >= 0);
+ TEST_ASSERT_TRUE(ret >= 0);
}
if (started)
{
ret = usrsocktest_daemon_stop();
- assert(ret == OK);
+ TEST_ASSERT_EQUAL(ret, OK);
}
}
diff --git a/examples/usrsocktest/usrsocktest_nodaemon.c b/examples/usrsocktest/usrsocktest_nodaemon.c
index 83b8f6c..3fd45f5 100644
--- a/examples/usrsocktest/usrsocktest_nodaemon.c
+++ b/examples/usrsocktest/usrsocktest_nodaemon.c
@@ -100,7 +100,7 @@
if (sd >= 0)
{
ret = close(sd);
- assert(ret >= 0);
+ TEST_ASSERT_TRUE(ret >= 0);
}
}
diff --git a/examples/usrsocktest/usrsocktest_poll.c b/examples/usrsocktest/usrsocktest_poll.c
index f2e99ee..d45691b 100644
--- a/examples/usrsocktest/usrsocktest_poll.c
+++ b/examples/usrsocktest/usrsocktest_poll.c
@@ -574,13 +574,13 @@
if (sd >= 0)
{
ret = close(sd);
- assert(ret >= 0);
+ TEST_ASSERT_TRUE(ret >= 0);
}
if (started)
{
ret = usrsocktest_daemon_stop();
- assert(ret == OK);
+ TEST_ASSERT_EQUAL(ret, OK);
}
}
diff --git a/examples/usrsocktest/usrsocktest_remote_disconnect.c b/examples/usrsocktest/usrsocktest_remote_disconnect.c
index b5397df..2e55a75 100644
--- a/examples/usrsocktest/usrsocktest_remote_disconnect.c
+++ b/examples/usrsocktest/usrsocktest_remote_disconnect.c
@@ -977,13 +977,13 @@
if (sd >= 0)
{
ret = close(sd);
- assert(ret >= 0);
+ TEST_ASSERT_TRUE(ret >= 0);
}
if (started)
{
ret = usrsocktest_daemon_stop();
- assert(ret == OK);
+ TEST_ASSERT_EQUAL(ret, OK);
}
}
diff --git a/examples/usrsocktest/usrsocktest_wake_with_signal.c b/examples/usrsocktest/usrsocktest_wake_with_signal.c
index ceb84fc..bf59e55 100644
--- a/examples/usrsocktest/usrsocktest_wake_with_signal.c
+++ b/examples/usrsocktest/usrsocktest_wake_with_signal.c
@@ -656,9 +656,9 @@
if (tid[i] != -1)
{
ret = pthread_cancel(tid[i]);
- assert(ret == OK);
+ TEST_ASSERT_EQUAL(ret, OK);
ret = pthread_join(tid[i], NULL);
- assert(ret == OK);
+ TEST_ASSERT_EQUAL(ret, OK);
}
if (test_sd[i] != -1)
