From 089376994a0dec0d89075dd5203a4a8b8d19dd7c Mon Sep 17 00:00:00 2001 From: zhumingxian Date: Thu, 30 Jun 2022 20:49:35 +0800 Subject: [PATCH] fix warning: unused variable Signed-off-by: zhumingxian --- .../lock/mutex/smoke/pthread_mutex_test_001.cpp | 6 +----- .../lock/mutex/smoke/pthread_mutex_test_002.cpp | 4 +--- .../lock/mutex/smoke/pthread_mutex_test_003.cpp | 5 +---- .../lock/mutex/smoke/pthread_mutex_test_004.cpp | 10 ++-------- .../lock/mutex/smoke/pthread_mutex_test_005.cpp | 10 ++-------- .../lock/mutex/smoke/pthread_mutex_test_006.cpp | 10 ++-------- .../lock/mutex/smoke/pthread_mutex_test_007.cpp | 11 +++-------- .../lock/mutex/smoke/pthread_mutex_test_008.cpp | 8 +------- .../lock/mutex/smoke/pthread_mutex_test_017.cpp | 5 ----- .../lock/mutex/smoke/pthread_mutex_test_019.cpp | 5 ----- .../lock/mutex/smoke/pthread_mutex_test_020.cpp | 8 -------- .../lock/mutex/smoke/pthread_mutex_test_021.cpp | 8 -------- .../lock/mutex/smoke/pthread_mutex_test_022.cpp | 8 -------- 13 files changed, 13 insertions(+), 85 deletions(-) diff --git a/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_001.cpp b/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_001.cpp index cd5249d6..e0e6ff7b 100644 --- a/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_001.cpp +++ b/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_001.cpp @@ -64,12 +64,8 @@ EXIT: static int Testcase(void) { - struct sched_param param = { 0 }; int ret; - void *res = nullptr; - pthread_attr_t a = { 0 }; - pthread_t thread = pthread_self(); - pthread_t newPthread, newPthread1; + pthread_t newPthread; pthread_mutexattr_t mutex; int index = 0; pthread_mutexattr_settype(&mutex, PTHREAD_MUTEX_NORMAL); diff --git a/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_002.cpp b/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_002.cpp index 55dda966..14eb9611 100644 --- a/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_002.cpp +++ b/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_002.cpp @@ -65,10 +65,8 @@ static int Testcase(void) { struct sched_param param = { 0 }; int ret; - void *res = nullptr; pthread_attr_t a = { 0 }; - pthread_t thread = pthread_self(); - pthread_t newPthread, newPthread1; + pthread_t newPthread; pthread_mutexattr_t mutex; int index = 0; int currThreadPri, currThreadPolicy; diff --git a/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_003.cpp b/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_003.cpp index ff3bca70..092ea25c 100644 --- a/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_003.cpp +++ b/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_003.cpp @@ -74,12 +74,9 @@ static int Testcase(void) { struct sched_param param = { 0 }; int ret; - void *res = nullptr; pthread_attr_t a = { 0 }; - pthread_t thread = pthread_self(); - pthread_t newPthread, newPthread1; + pthread_t newPthread; pthread_mutexattr_t mutex; - int count = 0; int currThreadPri, currThreadPolicy; g_preTaskPri = 0xffffffff; diff --git a/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_004.cpp b/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_004.cpp index f5affe14..a22b7020 100644 --- a/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_004.cpp +++ b/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_004.cpp @@ -49,8 +49,6 @@ static void *ThreadFuncTest3(void *a) int ret; int tid = Gettid(); pthread_t thread = pthread_self(); - int currThreadPri, currThreadPolicy; - struct sched_param param = { 0 }; ret = pthread_detach(thread); ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); @@ -124,14 +122,10 @@ EXIT: static int Testcase(void) { - struct sched_param param = { 0 }; int ret; - void *res = nullptr; - pthread_attr_t a = { 0 }; - pthread_t thread = pthread_self(); - pthread_t newPthread, newPthread1; + pthread_t newPthread; pthread_mutexattr_t mutex; - int index = 0; + pthread_mutexattr_settype(&mutex, PTHREAD_MUTEX_NORMAL); pthread_mutex_init(&g_muxLock001, &mutex); pthread_mutex_init(&g_muxLock002, &mutex); diff --git a/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_005.cpp b/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_005.cpp index 9d86a82c..b7f06350 100644 --- a/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_005.cpp +++ b/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_005.cpp @@ -49,8 +49,6 @@ static void *ThreadFuncTest3(void *a) int ret; int tid; pthread_t thread = pthread_self(); - int currThreadPri, currThreadPolicy; - struct sched_param param = { 0 }; ret = pthread_detach(thread); ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); @@ -126,14 +124,10 @@ EXIT: static int Testcase(void) { - struct sched_param param = { 0 }; int ret; - void *res = nullptr; - pthread_attr_t a = { 0 }; - pthread_t thread = pthread_self(); - pthread_t newPthread, newPthread1; + pthread_t newPthread; pthread_mutexattr_t mutex; - int index = 0; + pthread_mutexattr_settype(&mutex, PTHREAD_MUTEX_NORMAL); pthread_mutex_init(&g_muxLock001, &mutex); pthread_mutex_init(&g_muxLock002, &mutex); diff --git a/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_006.cpp b/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_006.cpp index ee263599..79c47faa 100644 --- a/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_006.cpp +++ b/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_006.cpp @@ -48,8 +48,6 @@ static void *ThreadFuncTest3(void *a) { int ret; int tid = Gettid(); - int currThreadPri, currThreadPolicy; - struct sched_param param = { 0 }; pthread_t thread = pthread_self(); ret = pthread_detach(thread); @@ -118,18 +116,14 @@ static void *ThreadFuncTest1(void *a) ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); EXIT: - return nullptr; +return nullptr; } static int Testcase(void) { - struct sched_param param = { 0 }; int ret; - void *res = nullptr; - pthread_attr_t a = { 0 }; - pthread_t newPthread, newPthread1; + pthread_t newPthread; pthread_mutexattr_t mutex; - int index = 0; pthread_mutexattr_settype(&mutex, PTHREAD_MUTEX_NORMAL); pthread_mutex_init(&g_mutexLock001, &mutex); pthread_mutex_init(&g_mutexLock002, &mutex); diff --git a/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_007.cpp b/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_007.cpp index e8bda9c5..b3129b80 100644 --- a/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_007.cpp +++ b/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_007.cpp @@ -43,7 +43,6 @@ static void *ThreadFuncTest3(void *a) { int ret; pthread_t thread = pthread_self(); - int currThreadPri, currThreadPolicy; struct sched_param param = { 0 }; struct timespec time; struct timeval timeVal = { 0 }; @@ -62,7 +61,7 @@ static void *ThreadFuncTest3(void *a) g_testToCount003++; while (g_testToCount002 == 0) { - SLEEP_AND_YIELD(2); // 2, delay enouge time + SLEEP_AND_YIELD(2); // 2, delay enough time } ret = pthread_mutex_unlock(&g_muxLock003); @@ -96,7 +95,7 @@ static void *ThreadFuncTest2(void *a) g_testToCount002++; while (g_testToCount001 == 0) { - SLEEP_AND_YIELD(2); // 2, delay enouge time + SLEEP_AND_YIELD(2); // 2, delay enough time } ret = pthread_mutex_unlock(&g_muxLock002); @@ -141,12 +140,8 @@ EXIT: static int Testcase(void) { - struct sched_param param = { 0 }; int ret; - void *res = nullptr; - pthread_attr_t a = { 0 }; - pthread_t thread = pthread_self(); - pthread_t newPthread, newPthread1; + pthread_t newPthread; pthread_mutexattr_t mutex = { 0 }; int index = TEST_COUNT; diff --git a/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_008.cpp b/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_008.cpp index 347b3941..c827e21f 100644 --- a/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_008.cpp +++ b/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_008.cpp @@ -41,8 +41,6 @@ static void *ThreadFuncTest3(void *a) { int ret; pthread_t thread = pthread_self(); - int currThreadPri, currThreadPolicy; - struct sched_param param = { 0 }; struct timespec time; struct timeval timeVal = { 0 }; @@ -120,12 +118,8 @@ EXIT: static int Testcase(void) { - struct sched_param param = { 0 }; int ret; - void *res = nullptr; - pthread_attr_t a = { 0 }; - pthread_t thread = pthread_self(); - pthread_t newPthread, newPthread1; + pthread_t newPthread; pthread_mutexattr_t mutex; int index = TEST_COUNT; diff --git a/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_017.cpp b/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_017.cpp index 5d7ef7d7..def2bfa2 100644 --- a/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_017.cpp +++ b/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_017.cpp @@ -38,7 +38,6 @@ static int g_testBackCount = 0; static void *ThreadFuncTest3(void *a) { int ret; - int tid = Gettid(); pthread_t thread = pthread_self(); ret = pthread_detach(thread); @@ -59,8 +58,6 @@ EXIT: static void *ThreadFuncTest2(void *a) { int ret; - int tid = Gettid(); - pthread_t thread = pthread_self(); g_testBackCount++; ret = pthread_mutex_lock(&g_mutexLock); @@ -78,10 +75,8 @@ static int TestCase(void) { struct sched_param param = { 0 }; int ret; - void *res = nullptr; int currThreadPri, currThreadPolicy; pthread_attr_t a = { 0 }; - pthread_t thread = pthread_self(); pthread_t newPthread; pthread_mutexattr_t mutex; pthread_mutexattr_settype(&mutex, PTHREAD_MUTEX_NORMAL); diff --git a/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_019.cpp b/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_019.cpp index a82af29a..05fdb6fa 100644 --- a/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_019.cpp +++ b/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_019.cpp @@ -45,8 +45,6 @@ static void *ThreadFuncTest2(void *a) { int ret; pthread_t thread = pthread_self(); - struct timespec time; - struct timeval timeVal = { 0 }; ret = pthread_detach(thread); ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); @@ -69,7 +67,6 @@ EXIT: static void *ThreadFuncTest1(void *a) { int ret; - pthread_t thread = pthread_self(); struct timespec time; struct timeval timeVal = { 0 }; @@ -106,9 +103,7 @@ static int Testcase(void) struct sched_param param = { 0 }; int ret; int threadCount; - void *res = nullptr; pthread_attr_t a = { 0 }; - pthread_t thread = pthread_self(); pthread_t newPthread[10], newPthread1; pthread_mutexattr_t mutex; int index = TEST_COUNT; diff --git a/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_020.cpp b/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_020.cpp index 34d7fa91..0c1f334e 100644 --- a/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_020.cpp +++ b/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_020.cpp @@ -45,8 +45,6 @@ static void *ThreadFuncTest2(void *a) { int ret; pthread_t thread = pthread_self(); - struct timespec time; - struct timeval timeVal = { 0 }; ret = pthread_detach(thread); ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); @@ -69,9 +67,6 @@ EXIT: static void *ThreadFuncTest1(void *a) { int ret; - pthread_t thread = pthread_self(); - struct timespec time; - struct timeval timeVal = { 0 }; ret = pthread_mutex_lock(&g_muxLock001); ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); @@ -96,7 +91,6 @@ EXIT: static void *ThreadFuncTest0(void *a) { int ret; - pthread_t thread = pthread_self(); struct timespec time; struct timeval timeVal = { 0 }; @@ -136,9 +130,7 @@ static int Testcase(void) struct sched_param param = { 0 }; int ret; int threadCount; - void *res = nullptr; pthread_attr_t a = { 0 }; - pthread_t thread = pthread_self(); pthread_t newPthread[10], newPthread1; pthread_mutexattr_t mutex; int index = TEST_COUNT; diff --git a/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_021.cpp b/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_021.cpp index 11b41103..4a515861 100644 --- a/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_021.cpp +++ b/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_021.cpp @@ -45,8 +45,6 @@ static void *ThreadFuncTest2(void *a) { int ret; pthread_t thread = pthread_self(); - struct timespec time; - struct timeval timeVal = { 0 }; ret = pthread_detach(thread); ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); @@ -69,9 +67,6 @@ EXIT: static void *ThreadFuncTest1(void *a) { int ret; - pthread_t thread = pthread_self(); - struct timespec time; - struct timeval timeVal = { 0 }; ret = pthread_mutex_lock(&g_muxLock001); ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); @@ -96,7 +91,6 @@ EXIT: static void *ThreadFuncTest0(void *a) { int ret; - pthread_t thread = pthread_self(); struct timespec time; struct timeval timeVal = { 0 }; @@ -136,9 +130,7 @@ static int Testcase(void) struct sched_param param = { 0 }; int ret; int threadCount; - void *res = nullptr; pthread_attr_t a = { 0 }; - pthread_t thread = pthread_self(); pthread_t newPthread[10], newPthread1; pthread_mutexattr_t mutex; int index = TEST_COUNT; diff --git a/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_022.cpp b/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_022.cpp index 5ff82980..0ed49774 100644 --- a/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_022.cpp +++ b/testsuites/unittest/process/lock/mutex/smoke/pthread_mutex_test_022.cpp @@ -45,8 +45,6 @@ static void *ThreadFuncTest2(void *a) { int ret; pthread_t thread = pthread_self(); - struct timespec time; - struct timeval timeVal = { 0 }; ret = pthread_detach(thread); ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); @@ -69,9 +67,6 @@ EXIT: static void *ThreadFuncTest1(void *a) { int ret; - pthread_t thread = pthread_self(); - struct timespec time; - struct timeval timeVal = { 0 }; ret = pthread_mutex_lock(&g_muxLock001); ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); @@ -96,7 +91,6 @@ EXIT: static void *ThreadFuncTest0(void *a) { int ret; - pthread_t thread = pthread_self(); struct timespec time; struct timeval timeVal = { 0 }; @@ -136,9 +130,7 @@ static int Testcase(void) struct sched_param param = { 0 }; int ret; int threadCount; - void *res = nullptr; pthread_attr_t a = { 0 }; - pthread_t thread = pthread_self(); pthread_t newPthread[10], newPthread1; pthread_mutexattr_t mutex; int index = TEST_COUNT; -- GitLab