From c2f9f6705f31fff3046a352a915a8361df33c9ee Mon Sep 17 00:00:00 2001 From: leibanli <18691361562@163.com> Date: Tue, 30 Aug 2022 21:53:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90openHarmony=E5=BC=80=E6=BA=90?= =?UTF-8?q?=E8=B4=A1=E7=8C=AE=E8=80=85=E8=AE=A1=E5=88=922022=E3=80=9118691?= =?UTF-8?q?361562@163.com?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: leibanli <18691361562@163.com> --- testsuites/unittest/extended/signal/full/signal_test_017.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/testsuites/unittest/extended/signal/full/signal_test_017.cpp b/testsuites/unittest/extended/signal/full/signal_test_017.cpp index 08968aa7..ed650e83 100644 --- a/testsuites/unittest/extended/signal/full/signal_test_017.cpp +++ b/testsuites/unittest/extended/signal/full/signal_test_017.cpp @@ -49,7 +49,6 @@ static void *ThreadSetFunc2(void *arg) ICUNIT_ASSERT_EQUAL_NULL(retValue, 0, retValue); retValue = sigaddset(&set, SIGUSR1); ICUNIT_ASSERT_EQUAL_NULL(retValue, 0, retValue); - int count; retValue = sigwait(&set, &sig); ICUNIT_ASSERT_EQUAL_NULL(retValue, 0, retValue); @@ -67,7 +66,6 @@ static void *ThreadSetDfl(void *arg) ICUNIT_ASSERT_EQUAL_NULL(retValue, 0, retValue); retValue = sigaddset(&set, SIGUSR1); ICUNIT_ASSERT_EQUAL_NULL(retValue, 0, retValue); - int count; retValue = sigwait(&set, &sig); ICUNIT_ASSERT_EQUAL_NULL(retValue, 0, retValue); @@ -85,7 +83,6 @@ static void *ThreadKill(void *arg) ICUNIT_ASSERT_EQUAL_NULL(retValue, 0, retValue); retValue = sigaddset(&set, SIGUSR1); ICUNIT_ASSERT_EQUAL_NULL(retValue, 0, retValue); - int count; retValue = sigwait(&set, &sig); ICUNIT_ASSERT_EQUAL_NULL(retValue, 0, retValue); From 325ea29df3dfd6bdb307272d80510d611980ccd3 Mon Sep 17 00:00:00 2001 From: leibanli <18691361562@163.com> Date: Tue, 30 Aug 2022 21:53:58 +0800 Subject: [PATCH 2/3] fix warning:unused variable 'count' Signed-off-by: leijiawei <18691361562@163.com> --- .../unittest/extended/signal/full/signal_test_017.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/testsuites/unittest/extended/signal/full/signal_test_017.cpp b/testsuites/unittest/extended/signal/full/signal_test_017.cpp index ed650e83..8069e7e5 100644 --- a/testsuites/unittest/extended/signal/full/signal_test_017.cpp +++ b/testsuites/unittest/extended/signal/full/signal_test_017.cpp @@ -52,6 +52,8 @@ static void *ThreadSetFunc2(void *arg) retValue = sigwait(&set, &sig); ICUNIT_ASSERT_EQUAL_NULL(retValue, 0, retValue); + + return NULL; } static void *ThreadSetDfl(void *arg) @@ -69,6 +71,8 @@ static void *ThreadSetDfl(void *arg) retValue = sigwait(&set, &sig); ICUNIT_ASSERT_EQUAL_NULL(retValue, 0, retValue); + + return NULL; } static void *ThreadKill(void *arg) @@ -86,6 +90,8 @@ static void *ThreadKill(void *arg) retValue = sigwait(&set, &sig); ICUNIT_ASSERT_EQUAL_NULL(retValue, 0, retValue); + + return NULL; } static int TestMultiPthreadFatherProcessExit() From 51f6a207237c4f3cad82cb4605cbe88e13f0a9d4 Mon Sep 17 00:00:00 2001 From: leijiawei <18691361562@163.com> Date: Wed, 31 Aug 2022 15:28:27 +0800 Subject: [PATCH 3/3] fix warning:unused variable 'count' & add return value Signed-off-by: leijiawei <18691361562@163.com> --- .../unittest/extended/signal/full/signal_test_017.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testsuites/unittest/extended/signal/full/signal_test_017.cpp b/testsuites/unittest/extended/signal/full/signal_test_017.cpp index 8069e7e5..675e8569 100644 --- a/testsuites/unittest/extended/signal/full/signal_test_017.cpp +++ b/testsuites/unittest/extended/signal/full/signal_test_017.cpp @@ -53,7 +53,7 @@ static void *ThreadSetFunc2(void *arg) retValue = sigwait(&set, &sig); ICUNIT_ASSERT_EQUAL_NULL(retValue, 0, retValue); - return NULL; + return NULL; } static void *ThreadSetDfl(void *arg) @@ -72,7 +72,7 @@ static void *ThreadSetDfl(void *arg) retValue = sigwait(&set, &sig); ICUNIT_ASSERT_EQUAL_NULL(retValue, 0, retValue); - return NULL; + return NULL; } static void *ThreadKill(void *arg) @@ -91,7 +91,7 @@ static void *ThreadKill(void *arg) retValue = sigwait(&set, &sig); ICUNIT_ASSERT_EQUAL_NULL(retValue, 0, retValue); - return NULL; + return NULL; } static int TestMultiPthreadFatherProcessExit()