diff --git a/OAT.xml b/OAT.xml index edfeff4f184122714e3f052ebcf46b0e08f952fd..e25ecbecff579f91ec792f5bc7292361ca666151 100644 --- a/OAT.xml +++ b/OAT.xml @@ -23,6 +23,7 @@ + diff --git a/donate.md b/donate.md index 859ed6b6a48178940e5647009f6a574ddb48f91b..6c2a9d887810e69695e8d94aef73cf06b0d92774 100644 --- a/donate.md +++ b/donate.md @@ -13,6 +13,9 @@ + + + ### 捐助方式 diff --git a/testsuites/kernel/include/osTest.h b/testsuites/kernel/include/osTest.h index 88dbe464192f5a6a8838e604b6adb19f4705fa81..3486e4b1092ae3ac9b2196d43c51d3cd006c9be3 100644 --- a/testsuites/kernel/include/osTest.h +++ b/testsuites/kernel/include/osTest.h @@ -86,14 +86,14 @@ extern "C" { #endif /* __cpluscplus */ #endif /* __cpluscplus */ -#define TEST_TASK_PARAM_INIT(testTask, task_name, entry, prio) \ - do { \ - memset(&testTask, 0, sizeof(TSK_INIT_PARAM_S)); \ - testTask.pfnTaskEntry = (TSK_ENTRY_FUNC)entry; \ - testTask.uwStackSize = 0x1000; \ - testTask.pcName = task_name; \ - testTask.usTaskPrio = prio; \ - testTask.uwResved = LOS_TASK_STATUS_DETACHED; \ +#define TEST_TASK_PARAM_INIT(testTask, task_name, entry, prio) \ + do { \ + (void)memset_s(&(testTask), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); \ + testTask.pfnTaskEntry = (TSK_ENTRY_FUNC)entry; \ + testTask.uwStackSize = 0x1000; \ + testTask.pcName = task_name; \ + testTask.usTaskPrio = prio; \ + testTask.uwResved = LOS_TASK_STATUS_DETACHED; \ } while (0); #ifdef LOSCFG_KERNEL_SMP diff --git a/testsuites/kernel/sample/kernel_base/core/hwi_nesting/It_hwi_nesting.c b/testsuites/kernel/sample/kernel_base/core/hwi_nesting/It_hwi_nesting.c index 2d0d43ab1f40710ccfe6f9cca2dd4b4e022ca066..8c330828ad1724c17f3b7cc1324a0932df73efb5 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi_nesting/It_hwi_nesting.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi_nesting/It_hwi_nesting.c @@ -50,7 +50,7 @@ VOID RecordIntrTrace(INT32 irq, INT32 direction) VOID ResetIntrTrace(VOID) { g_traceIdx = 0; - memset(g_intrTrace, 0, RECORD_SIZE); + (void)memset_s(g_intrTrace, RECORD_SIZE, 0, RECORD_SIZE); } UINT32 CheckIntrTrace(UINT32 *expect, UINT32 num) diff --git a/testsuites/kernel/sample/kernel_base/core/hwi_nesting/full/It_los_hwi_nesting_006.c b/testsuites/kernel/sample/kernel_base/core/hwi_nesting/full/It_los_hwi_nesting_006.c index 58be6103da6a01f6e63fc7c103386440bbcf9b62..2421bfa97651f3a71a2225d3d13ac36c4055586e 100644 --- a/testsuites/kernel/sample/kernel_base/core/hwi_nesting/full/It_los_hwi_nesting_006.c +++ b/testsuites/kernel/sample/kernel_base/core/hwi_nesting/full/It_los_hwi_nesting_006.c @@ -44,7 +44,7 @@ static VOID NestingPrioHigh(INT32 irq, VOID *data) { g_intrHandleEnd = 1; UINT32 temp[0x100][2] = {0}; - memset(temp, 1, sizeof(UINT32) * 0x100 * 2); // 2, buffer size. + (void)memset_s(temp, sizeof(UINT32) * 0x100 * 2, 1, sizeof(UINT32) * 0x100 * 2); // 2, buffer size. } static VOID TaskF01(VOID) diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_040.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_040.c index 9b7fcb233f1c06d8de3190b29965a8013d1c5799..5b9deb01ef82c334bfe216e9305c616047955c06 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_040.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_040.c @@ -58,7 +58,7 @@ static UINT32 Testcase(void) // 32, number of cycles for (index = 0; index < 32; index++) { task1.usTaskPrio = index; - snprintf(acName, 10, "Tsk040A%2d", index); // 10, snprintf size. + (void)snprintf_s(acName, TASK_NAME_NUM, TASK_NAME_NUM - 1, "Tsk040A%2d", index); task1.pcName = acName; task1.uwResved = LOS_TASK_STATUS_DETACHED; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_082.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_082.c index ac9b3a885e95c720af0aefe06254ce3695897f8d..8fc8eb7e81fa18a7088c2817bd4664b7c65545d7 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_082.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_082.c @@ -58,9 +58,10 @@ EXIT: static UINT32 Testcase(void) { UINT32 ret; - TSK_INIT_PARAM_S task1; + TSK_INIT_PARAM_S task1 = {0}; + LOS_EventInit(&g_eventCb01); - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "Tsk082A"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_118.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_118.c index 7054a2fd17ae1266369df1e2ecfb9b3cf4875384..e3ea1bf731f140b2b3cff39e429f441e9ebd7ce3 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_118.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_118.c @@ -142,7 +142,8 @@ static UINT32 Testcase(void) ret = LOS_TaskCreate(&g_testTaskID01, &task1); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + ret = memset_s(&task1, sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF02; task1.uwStackSize = TASK_STACK_SIZE_TEST; task1.pcName = "Tsk118B"; diff --git a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_138.c b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_138.c index e341097687362f244a579818e03f4e62e1b78997..6a4210d0384c9f245434d90ade913570df145ac9 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_138.c +++ b/testsuites/kernel/sample/kernel_base/core/task/full/It_los_task_138.c @@ -142,7 +142,8 @@ static UINT32 Testcase(void) ret = LOS_TaskCreate(&g_testTaskID01, &task1); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + ret = memset_s(&task1, sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF02; task1.uwStackSize = TASK_STACK_SIZE_TEST; task1.pcName = "Tsk118B"; diff --git a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_024.c b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_024.c index d1b38e313ab164635ec79c6b49d63f567717c067..7ed3dcd4c1a1d5057914f1769fec3beb5f9ac9e1 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_024.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_024.c @@ -80,7 +80,8 @@ static UINT32 Testcase(void) currCpuid = (ArchCurrCpuid() + 1) % LOSCFG_KERNEL_CORE_NUM; #endif - memset(&task, 0, sizeof(TSK_INIT_PARAM_S)); + ret = memset_s(&task, sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); task.pfnTaskEntry = (TSK_ENTRY_FUNC)ItTimeslice001F01; task.usTaskPrio = TASK_PRIO_TEST_TASK + 1; task.pcName = "it_timeslice_001_f01"; diff --git a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_025.c b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_025.c index 33270a1744df2c4d496e3cefe68675dadb87ae7b..4c6909e23a0d5599c04c08c3c1006feb035d2ee4 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_025.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_025.c @@ -99,7 +99,8 @@ static UINT32 Testcase(void) currCpuid = (ArchCurrCpuid() + 1) % LOSCFG_KERNEL_CORE_NUM; #endif - memset(&task, 0, sizeof(TSK_INIT_PARAM_S)); + ret = memset_s(&task, sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); task.pfnTaskEntry = (TSK_ENTRY_FUNC)ItTimeslice002F01; task.usTaskPrio = TASK_PRIO_TEST_TASK + 1; task.pcName = "it_timeslice_002_f01"; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_001.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_001.c index 48a40bc731afd83f8cf65312f9526aebd953ad13..6b46ebb723d3c708f761962b9d065c64e7d2598a 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_001.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_001.c @@ -57,8 +57,8 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + TSK_INIT_PARAM_S task1 = {0}; + task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EventTsk1"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_002.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_002.c index 758036c4110e58e5ed397e2c19f7bac1806e2a50..032e53a5f073bb1ecdde192f2b3b61a6f8383f75 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_002.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_002.c @@ -60,8 +60,8 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + TSK_INIT_PARAM_S task1 = {0}; + task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EventTsk2"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_003.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_003.c index f64c9979f1173e7c4031030b911f1fb9abc1bd9d..bf8a5fb1dcb15ed43ddb4d8bb93bb1ca2b22bb14 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_003.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_003.c @@ -56,8 +56,8 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + TSK_INIT_PARAM_S task1 = {0}; + task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EventTsk3"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_004.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_004.c index 3b080e9fcbcdeef3b867c3aa1796a70850683d59..566cadca8624e47f77066e6364d06ed0a87f117c 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_004.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_004.c @@ -57,8 +57,8 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + TSK_INIT_PARAM_S task1 = {0}; + task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EventTsk4"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_006.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_006.c index 84bd9b90ad88fb115c55fbc9d6f8857a7c3fd2d6..930d16177d61f17c956e7e0b65bba9afa8760f98 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_006.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_006.c @@ -62,8 +62,8 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + TSK_INIT_PARAM_S task1 = {0}; + task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EventTsk6"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_007.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_007.c index 7823fa10abe4cb5385a5e73eaeba0d64fb34cfc7..890f8c82bafd43380bb9183aa330388e83a47902 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_007.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_007.c @@ -88,8 +88,8 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + TSK_INIT_PARAM_S task1 = {0}; + task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EventTsk7"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_008.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_008.c index 5f9caa63c6f126fd617b69de7b90d144fc048929..27e60a7452c27c20887458228dcc003031db6b70 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_008.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_008.c @@ -62,8 +62,8 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + TSK_INIT_PARAM_S task1 = {0}; + task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EventTsk8"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_009.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_009.c index 214fa11f056ea4b96d08ce739a2014fd1f837849..63f734cffe42ea79ef941a1237c5bf381c079575 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_009.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_009.c @@ -70,8 +70,8 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + TSK_INIT_PARAM_S task1 = {0}; + task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EventTsk9"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_010.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_010.c index ff0e6d67ac8df63ce0d8a269c32587a37df89a25..4ddddb6e2f3ca02d7188034f5ac462c171207e3c 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_010.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_010.c @@ -62,8 +62,8 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + TSK_INIT_PARAM_S task1 = {0}; + task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EventTsk10"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_011.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_011.c index 5bd31ef7a1f2a29f260511036ed4f9499d343ab4..83b447e32721cbb0abfc36bff5daecfa34b541b0 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_011.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_011.c @@ -69,8 +69,8 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + TSK_INIT_PARAM_S task1 = {0}; + task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EventTsk11"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_012.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_012.c index 1ff137c7299c27bcca9577043ee24f1d52f313c7..8a68e30d195a61c67f68899d904db0535a4a4695 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_012.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_012.c @@ -74,8 +74,8 @@ static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + TSK_INIT_PARAM_S task1 = {0}; + task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EventTsk12"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_013.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_013.c index e5138c2be0397bc2fa005a340ef62a109af02e75..5c88cbe97ed78eaf43d452b72713c59404cdf0fc 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_013.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_013.c @@ -75,8 +75,8 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + TSK_INIT_PARAM_S task1 = {0}; + task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EventTsk13"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_014.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_014.c index efa807927e76f597a21afed099cf26d4841e5c00..75051c1c46566d585299bfea4558e1119781ad95 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_014.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_014.c @@ -67,8 +67,8 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + TSK_INIT_PARAM_S task1 = {0}; + task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EventTsk14"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_015.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_015.c index e694d325f77752115783efdf3cea228595fe4fab..c25036b25a8e02156fe36b17168aebb297dbee38 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_015.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_015.c @@ -65,8 +65,8 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + TSK_INIT_PARAM_S task1 = {0}; + task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EventTsk15"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_016.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_016.c index 6bc9a0bb6eb83d0ee1d3b126dbd0eee8080c9683..d8f96bc125ad7507d69e1be759c70e5d377f940e 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_016.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_016.c @@ -60,8 +60,8 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + TSK_INIT_PARAM_S task1 = {0}; + task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EventTsk16"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_018.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_018.c index 9f43e7cb63202260517a39136f725cbfc344aa17..a7464cb5a7d2238e71756f670cfc1a6cca6edf5a 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_018.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_018.c @@ -74,8 +74,8 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + TSK_INIT_PARAM_S task1 = {0}; + task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EvtTsk18A"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_019.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_019.c index 641b7d58f053fe45c1bfad4cb2eb8e0f3def61c0..e756369747793b9322f54b65e9e6f968c9f0d921 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_019.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_019.c @@ -83,8 +83,8 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + TSK_INIT_PARAM_S task1 = {0}; + task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EvtTsk19A"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_020.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_020.c index 118fb0b86325f5223c982855db5cfd913857e0e8..0d3ecd97b2483d745094facef21de5015759af7e 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_020.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_020.c @@ -84,8 +84,8 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + TSK_INIT_PARAM_S task1 = {0}; + task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EvtTsk20A"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_021.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_021.c index 27b1c7745da29205e6a352465c52a8879720ae4f..7b1e16738de4357a003c8874560261362f54b381 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_021.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_021.c @@ -54,8 +54,8 @@ EXIT: static VOID TaskF01(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + TSK_INIT_PARAM_S task1 = {0}; + task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF02; task1.pcName = "EvtTsk21B"; task1.uwStackSize = TASK_STACK_SIZE_TEST; @@ -85,8 +85,8 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + TSK_INIT_PARAM_S task1 = {0}; + task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EvtTsk21A"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_022.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_022.c index 686c18cde9f57185a4d114e44e4ac8a7dfa01de1..bd635ce2e7f09c1bfe1a3efc813db22e97a4e248 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_022.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_022.c @@ -73,8 +73,8 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + TSK_INIT_PARAM_S task1 = {0}; + task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EvtTsk22A"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_023.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_023.c index 24ffcceef02319e37ca4966ca62d327e379d0bf7..86865e17a5501d58f0a6d6440de6f324a23b0cf3 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_023.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_023.c @@ -92,9 +92,8 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; + TSK_INIT_PARAM_S task1 = {0}; - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EvtTsk23A"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_026.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_026.c index fc30d6a25074dcee59b9bb4c4c7a92fab2270af4..74064d8d908f2d13b9addbb8e97f85395cc423d4 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_026.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_026.c @@ -66,8 +66,8 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + TSK_INIT_PARAM_S task1 = {0}; + task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EventTsk26"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_027.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_027.c index bcd10b3368c6b09666bc39ce1e712d11ebd1101e..ea0324c649f124b02c6bda250877cf815ee2fa8e 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_027.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_027.c @@ -81,8 +81,8 @@ static UINT32 Testcase(VOID) UINT16 swTmrID; - TSK_INIT_PARAM_S task1; - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + TSK_INIT_PARAM_S task1 = {0}; + task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EventTsk27"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_029.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_029.c index 3ade02c9dbd79c87944cd1512506f8dd0b23378f..3ac2c858052ddc03e84076b392efe9186486ea13 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_029.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_029.c @@ -55,10 +55,9 @@ static UINT32 Testcase(VOID) { UINT32 ret; UINT32 event; - TSK_INIT_PARAM_S task1; + TSK_INIT_PARAM_S task1 = {0}; LOS_EventInit(&g_event); - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EventTsk29"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_030.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_030.c index b38249298d2b4a20a90651d7a692cab41925ec11..d52f38d3dc1f9ab0e9f0a9a4169d5b5ff8974ac1 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_030.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_030.c @@ -52,8 +52,8 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + TSK_INIT_PARAM_S task1 = {0}; + task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EventTsk30"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_032.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_032.c index ec039583f519fb76bce5187c32512ddbfdf52cde..8d8442121b65bdbe0c154846a8a77252dd13a7ed 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_032.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_032.c @@ -83,12 +83,11 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; + TSK_INIT_PARAM_S task1 = {0}; g_testCount = 0; LOS_EventInit(&g_event); - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EventTsk32A"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_033.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_033.c index 28a33c499f9ee316935c5d69ae8c2feccb5b2c39..11e39058a0a3775469ef67aafd1eee1b1f43d849 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_033.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_033.c @@ -96,12 +96,11 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; + TSK_INIT_PARAM_S task1 = {0}; g_testCount = 0; LOS_EventInit(&g_event); - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EventTsk33A"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_037.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_037.c index 4a5db7d20de03eb2a2cc9fd5cb2ad2f9878496cd..5cf5c025a4e029196d24afe96676e947ed11b3f0 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_037.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_037.c @@ -60,9 +60,9 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; + TSK_INIT_PARAM_S task1 = {0}; LOS_EventInit(&g_event); - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EventTsk37"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_038.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_038.c index ff269c616df68b9a4a524c947c2a78af38db87e4..19e68eb13f60c550298f7bf980d89a115d8f4f81 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_038.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_038.c @@ -104,13 +104,12 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; + TSK_INIT_PARAM_S task1 = {0}; LOS_EventInit(&g_event); LOS_EventInit(&g_pevent2); g_testCount = 0; - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EventTsk38A"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_039.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_039.c index 7ded86366c6f21499df7d56e9e2996242f7d78c0..c434a84608f6ee1a3365dd00807c800ea4e4caee 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_039.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_039.c @@ -56,10 +56,8 @@ static UINT32 Testcase(VOID) { UINT32 ret; TSK_INIT_PARAM_S task1 = { 0 }; - LOS_EventInit(&g_event); - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EventTsk39"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_040.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_040.c index 0d8d3c8df342d5dd80055250e5671f326c17ed24..f1ded303ca3558fba5c0473942fcc4982ce916b4 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_040.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_040.c @@ -55,8 +55,8 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + TSK_INIT_PARAM_S task1 = {0}; + task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EventTsk40"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_042.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_042.c index 40439fda9b6e6fb0742722f15c62b9507fb53e7e..2cad463792d039096b0c1ee0cbf358681f4248a2 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_042.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_042.c @@ -56,9 +56,9 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; + TSK_INIT_PARAM_S task1 = {0}; EVENT_CB_S pevent = { 0 }; - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EventTsk42"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_043.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_043.c index 4a5abb7f36a2e97b1661af998da843e1f7d9047b..0777cac5e801816d6fe331eca2208063580d8d50 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_043.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_043.c @@ -81,8 +81,8 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + TSK_INIT_PARAM_S task1 = {0}; + task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EventTsk43"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/smoke/It_los_event_036.c b/testsuites/kernel/sample/kernel_base/ipc/event/smoke/It_los_event_036.c index 7428ff1693567f692177e2e0a8d45bed04309c2e..81fdf88b04e9e7e134985640a309c7a9d9b2c6cb 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/smoke/It_los_event_036.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/smoke/It_los_event_036.c @@ -56,11 +56,10 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; + TSK_INIT_PARAM_S task1 = {0}; LOS_EventInit(&g_event); - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EventTsk36"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/smoke/It_los_event_041.c b/testsuites/kernel/sample/kernel_base/ipc/event/smoke/It_los_event_041.c index 2afd1b0ac30c41e3ed3e3b9cc23c5ad9b46c9d45..2f5cf5157900db6653d8e49dcaf7b31fcc8f3f5d 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/smoke/It_los_event_041.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/smoke/It_los_event_041.c @@ -57,8 +57,8 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 ret; - TSK_INIT_PARAM_S task1; - memset(&task1, 0, sizeof(TSK_INIT_PARAM_S)); + TSK_INIT_PARAM_S task1 = {0}; + task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.pcName = "EventTsk41"; task1.uwStackSize = TASK_STACK_SIZE_TEST; diff --git a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_057.c b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_057.c index 8ac781b53f9cef07819d7641b1b5666a9cf16898..96f50eb6c62511b74da347ce50e856a21e58cf0e 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_057.c +++ b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_057.c @@ -46,7 +46,8 @@ static UINT32 Testcase(VOID) g_testQueueID01 = 0; - memset(bufname, 'a', 5001); // 5001, buffer size. + ret = memset_s(bufname, 5001, 'a', 5001); // 5001, buffer size. + ICUNIT_ASSERT_EQUAL(ret, 0, ret); bufname[5001] = '\0'; // 5001, buffer size. ret = LOS_QueueCreate(bufname, 3, &g_testQueueID01, 0, sizeof(UINTPTR)); // 3, Set the queue length. ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); diff --git a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_087.c b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_087.c index 8788d7fdd00e49427bc01fc0bb1c379d217474bd..5d72c4a9406d06065f7f44d0294f662de08ae925 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_087.c +++ b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_087.c @@ -57,7 +57,8 @@ static UINT32 Testcase(VOID) ret = LOS_QueueWrite(g_testQueueID01, filebuf, count, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - memset(readbuf, 0, 260); // 260, Read buf size. + ret = memset_s(readbuf, 260, 0, 260); // 260, Read buf size. + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); ret = LOS_QueueRead(g_testQueueID01, readbuf, count, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); diff --git a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_089.c b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_089.c index 5041323cd2e43e2997d8844293cbc235ee817c78..d63cf9f3b6598f4f2b7f052aadd040988ed6caae 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_089.c +++ b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_089.c @@ -66,7 +66,8 @@ static UINT32 Testcase(VOID) ICUNIT_GOTO_EQUAL(ret, LOS_ERRNO_QUEUE_ISFULL, ret, EXIT); for (i = 0; i < 1000; i++) { // 1000, The loop frequency. - memset(readbuf, 0, 260); // 260, Read buf size. + ret = memset_s(readbuf, 260, 0, 260); // 260, Read buf size. + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); ret = LOS_QueueRead(g_testQueueID01, readbuf, QUEUE_SHORT_BUFFER_LENGTH, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); } diff --git a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_098.c b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_098.c index 5671e50785ca6ca4cca85612b379a4a423aa2de8..1ce9ee419ea57ab9e50b78b0b8af79026ed10b1a 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_098.c +++ b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_098.c @@ -47,14 +47,16 @@ static UINT32 Testcase(VOID) UINT32 readSize; queueID = LOSCFG_BASE_IPC_QUEUE_CONFIG + 1; - memset(buff2, 0, QUEUE_SHORT_BUFFER_LENGTH); + ret = memset_s(buff2, QUEUE_SHORT_BUFFER_LENGTH, 0, QUEUE_SHORT_BUFFER_LENGTH); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); readSize = 8; // 8, Read the setting size of queue buffer. ret = LOS_QueueReadCopy(queueID, &buff2, &readSize, 0); ICUNIT_GOTO_EQUAL(ret, LOS_ERRNO_QUEUE_INVALID, ret, EXIT); ICUNIT_GOTO_EQUAL(readSize, 8, readSize, EXIT); // 8, Here, assert that g_testCount is equal to 8. queueID = LOSCFG_BASE_IPC_QUEUE_CONFIG; - memset(buff2, 0, QUEUE_SHORT_BUFFER_LENGTH); + ret = memset_s(buff2, QUEUE_SHORT_BUFFER_LENGTH, 0, QUEUE_SHORT_BUFFER_LENGTH); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); readSize = 8; // 8, Read the setting size of queue buffer. ret = LOS_QueueReadCopy(queueID, &buff2, &readSize, 0); @@ -62,14 +64,16 @@ static UINT32 Testcase(VOID) ICUNIT_GOTO_EQUAL(readSize, 8, readSize, EXIT); // 8, Here, assert that g_testCount is equal to 8. queueID = LOSCFG_BASE_IPC_QUEUE_CONFIG - 1; - memset(buff2, 0, QUEUE_SHORT_BUFFER_LENGTH); + ret = memset_s(buff2, QUEUE_SHORT_BUFFER_LENGTH, 0, QUEUE_SHORT_BUFFER_LENGTH); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); readSize = 8; // 8, Read the setting size of queue buffer. ret = LOS_QueueReadCopy(queueID, &buff2, &readSize, 0); ICUNIT_GOTO_EQUAL(ret, LOS_ERRNO_QUEUE_NOT_CREATE, ret, EXIT); ICUNIT_GOTO_EQUAL(readSize, 8, readSize, EXIT); // 8, Here, assert that g_testCount is equal to 8. queueID = 0; - memset(buff2, 0, QUEUE_SHORT_BUFFER_LENGTH); + ret = memset_s(buff2, QUEUE_SHORT_BUFFER_LENGTH, 0, QUEUE_SHORT_BUFFER_LENGTH); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); readSize = 8; // 8, Read the setting size of queue buffer. ret = LOS_QueueReadCopy(queueID - 1, &buff2, &readSize, 0); ICUNIT_GOTO_EQUAL(ret, LOS_ERRNO_QUEUE_INVALID, ret, EXIT); diff --git a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_099.c b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_099.c index 42d141613d03ff1932208d00cf60e6d294290970..72ac08dff4da87a9d6ad1a54fd1af745b0619146 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_099.c +++ b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_099.c @@ -55,7 +55,8 @@ static UINT32 Testcase(VOID) ret = LOS_QueueDelete(queueID); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - memset(buff2, 0, QUEUE_SHORT_BUFFER_LENGTH); + ret = memset_s(buff2, QUEUE_SHORT_BUFFER_LENGTH, 0, QUEUE_SHORT_BUFFER_LENGTH); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); readSize = 8; // 8, Read the setting size of queue buffer. ret = LOS_QueueReadCopy(queueID, &buff2, &readSize, 0); ICUNIT_GOTO_EQUAL(ret, LOS_ERRNO_QUEUE_NOT_CREATE, ret, EXIT); diff --git a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_101.c b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_101.c index 5b28c369c65b924eaa11340691d212c0c2ea590c..3384dda662cf32cb16c85fba048aea342e285082 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_101.c +++ b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_101.c @@ -52,12 +52,14 @@ static UINT32 Testcase(VOID) ret = LOS_QueueWrite(queueID, &buff1, 8, 0); // 8, Write the setting size of queue buffer. ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - memset(buff2, 0, QUEUE_SHORT_BUFFER_LENGTH); + ret = memset_s(buff2, QUEUE_SHORT_BUFFER_LENGTH, 0, QUEUE_SHORT_BUFFER_LENGTH); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); readSize = sizeof(buff1); ret = LOS_QueueReadCopy(queueID, NULL, &readSize, 0); ICUNIT_GOTO_EQUAL(ret, LOS_ERRNO_QUEUE_READ_PTR_NULL, ret, EXIT); - memset(buff2, 0, QUEUE_SHORT_BUFFER_LENGTH); + ret = memset_s(buff2, QUEUE_SHORT_BUFFER_LENGTH, 0, QUEUE_SHORT_BUFFER_LENGTH); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); readSize = sizeof(buff1); ret = LOS_QueueReadCopy(queueID, &buff2, &readSize, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); diff --git a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_102.c b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_102.c index 65fb6c170ace4df6ec7d404c2e64c9cfffac10e3..7c793f844f818109f56f3fd469689ffa4f6af1d9 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_102.c +++ b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_102.c @@ -52,7 +52,8 @@ static UINT32 Testcase(VOID) ret = LOS_QueueWrite(queueID, &buff1, 8, 0); // 8, Write the setting size of queue buffer. ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - memset(buff2, 0, QUEUE_SHORT_BUFFER_LENGTH); + ret = memset_s(buff2, QUEUE_SHORT_BUFFER_LENGTH, 0, QUEUE_SHORT_BUFFER_LENGTH); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); readSize = sizeof(buff1); ret = LOS_QueueReadCopy(queueID, &buff2, &readSize, 0xffffffff); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); @@ -60,7 +61,8 @@ static UINT32 Testcase(VOID) ret = LOS_QueueWrite(queueID, &buff1, 8, 0); // 8, Write the setting size of queue buffer. ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - memset(buff2, 0, QUEUE_SHORT_BUFFER_LENGTH); + ret = memset_s(buff2, QUEUE_SHORT_BUFFER_LENGTH, 0, QUEUE_SHORT_BUFFER_LENGTH); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); readSize = sizeof(buff1); ret = LOS_QueueReadCopy(queueID, &buff2, &readSize, 0xffffffff + 1); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); @@ -68,7 +70,8 @@ static UINT32 Testcase(VOID) ret = LOS_QueueWrite(queueID, &buff1, 8, 0); // 8, Write the setting size of queue buffer. ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - memset(buff2, 0, QUEUE_SHORT_BUFFER_LENGTH); + ret = memset_s(buff2, QUEUE_SHORT_BUFFER_LENGTH, 0, QUEUE_SHORT_BUFFER_LENGTH); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); readSize = sizeof(buff1); ret = LOS_QueueReadCopy(queueID, &buff2, &readSize, 0xffffffff - 1); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); diff --git a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_106.c b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_106.c index 5e40b98b3d1f7262445a0121dc3b5fea27857d18..896d059fb5acd43b3baa34ed7480c9711a1770ef 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_106.c +++ b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_106.c @@ -51,14 +51,16 @@ static UINT32 Testcase(VOID) ret = LOS_QueueWriteCopy(queueID, NULL, QUEUE_SHORT_BUFFER_LENGTH, 0); ICUNIT_GOTO_EQUAL(ret, LOS_ERRNO_QUEUE_WRITE_PTR_NULL, ret, EXIT); - memset(buff2, 0, QUEUE_SHORT_BUFFER_LENGTH); + ret = memset_s(buff2, QUEUE_SHORT_BUFFER_LENGTH, 0, QUEUE_SHORT_BUFFER_LENGTH); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); ret = LOS_QueueRead(queueID, &buff2, QUEUE_SHORT_BUFFER_LENGTH, 0); ICUNIT_GOTO_EQUAL(ret, LOS_ERRNO_QUEUE_ISEMPTY, ret, EXIT); ret = LOS_QueueWriteCopy(queueID, &buff1, QUEUE_SHORT_BUFFER_LENGTH, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - memset(buff2, 0, QUEUE_SHORT_BUFFER_LENGTH); + ret = memset_s(buff2, QUEUE_SHORT_BUFFER_LENGTH, 0, QUEUE_SHORT_BUFFER_LENGTH); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); ret = LOS_QueueRead(queueID, &buff2, QUEUE_SHORT_BUFFER_LENGTH, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); diff --git a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_107.c b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_107.c index b8a24b94656aa1168a6afe10a01982a88389f59e..a29dbdc5c11ace7e9bb8b4e2d3fed970d7786904 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_107.c +++ b/testsuites/kernel/sample/kernel_base/ipc/queue/full/It_los_queue_107.c @@ -51,21 +51,24 @@ static UINT32 Testcase(VOID) ret = LOS_QueueWriteCopy(queueID, &buff1, QUEUE_SHORT_BUFFER_LENGTH, 0xffffffff); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - memset(buff2, 0, QUEUE_SHORT_BUFFER_LENGTH); + ret = memset_s(buff2, QUEUE_SHORT_BUFFER_LENGTH, 0, QUEUE_SHORT_BUFFER_LENGTH); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); ret = LOS_QueueRead(queueID, &buff2, QUEUE_SHORT_BUFFER_LENGTH, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); ret = LOS_QueueWriteCopy(queueID, &buff1, QUEUE_SHORT_BUFFER_LENGTH, 0xffffffff + 1); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - memset(buff2, 0, QUEUE_SHORT_BUFFER_LENGTH); + ret = memset_s(buff2, QUEUE_SHORT_BUFFER_LENGTH, 0, QUEUE_SHORT_BUFFER_LENGTH); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); ret = LOS_QueueRead(queueID, &buff2, QUEUE_SHORT_BUFFER_LENGTH, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); ret = LOS_QueueWriteCopy(queueID, &buff1, QUEUE_SHORT_BUFFER_LENGTH, 0xffffffff - 1); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - memset(buff2, 0, QUEUE_SHORT_BUFFER_LENGTH); + ret = memset_s(buff2, QUEUE_SHORT_BUFFER_LENGTH, 0, QUEUE_SHORT_BUFFER_LENGTH); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); ret = LOS_QueueRead(queueID, &buff2, QUEUE_SHORT_BUFFER_LENGTH, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); diff --git a/testsuites/kernel/sample/kernel_base/ipc/queue/smoke/It_los_queue_100.c b/testsuites/kernel/sample/kernel_base/ipc/queue/smoke/It_los_queue_100.c index 4d0290c306a9dc0d6379bba8f6b5bc4225189140..5820be162d431adee88ec9e8ad6453973a3941a6 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/queue/smoke/It_los_queue_100.c +++ b/testsuites/kernel/sample/kernel_base/ipc/queue/smoke/It_los_queue_100.c @@ -51,7 +51,8 @@ static UINT32 Testcase(VOID) ret = LOS_QueueWrite(queueID, &buff1, 8, 0); // 8, Write the setting size of queue buffer. ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - memset(buff2, 0, QUEUE_SHORT_BUFFER_LENGTH); + ret = memset_s(buff2, QUEUE_SHORT_BUFFER_LENGTH, 0, QUEUE_SHORT_BUFFER_LENGTH); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); readSize = sizeof(buff1); ret = LOS_QueueReadCopy(queueID, &buff2, &readSize, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); @@ -59,7 +60,8 @@ static UINT32 Testcase(VOID) ret = LOS_QueueWrite(queueID, &buff1, 8, 0); // 8, Write the setting size of queue buffer. ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - memset(buff2, 0, QUEUE_SHORT_BUFFER_LENGTH); + ret = memset_s(buff2, QUEUE_SHORT_BUFFER_LENGTH, 0, QUEUE_SHORT_BUFFER_LENGTH); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); readSize = sizeof(buff1) + 1; ret = LOS_QueueReadCopy(queueID, &buff2, &readSize, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); @@ -67,7 +69,8 @@ static UINT32 Testcase(VOID) ret = LOS_QueueWrite(queueID, &buff1, 8, 0); // 8, Write the setting size of queue buffer. ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - memset(buff2, 0, QUEUE_SHORT_BUFFER_LENGTH); + ret = memset_s(buff2, QUEUE_SHORT_BUFFER_LENGTH, 0, QUEUE_SHORT_BUFFER_LENGTH); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); readSize = sizeof(buff1); ret = LOS_QueueReadCopy(queueID, &buff2, &readSize, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); @@ -75,7 +78,8 @@ static UINT32 Testcase(VOID) ret = LOS_QueueWrite(queueID, &buff1, 8, 0); // 8, Write the setting size of queue buffer. ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - memset(buff2, 0, QUEUE_SHORT_BUFFER_LENGTH); + ret = memset_s(buff2, QUEUE_SHORT_BUFFER_LENGTH, 0, QUEUE_SHORT_BUFFER_LENGTH); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); readSize = 0; ret = LOS_QueueReadCopy(queueID, &buff2, &readSize, 0); ICUNIT_GOTO_EQUAL(ret, LOS_ERRNO_QUEUE_READSIZE_IS_INVALID, ret, EXIT); diff --git a/testsuites/kernel/sample/kernel_base/ipc/queue/smoke/It_los_queue_105.c b/testsuites/kernel/sample/kernel_base/ipc/queue/smoke/It_los_queue_105.c index a7a975eb48ead467a3dc2a61301a4ef67ac34e0a..9f93ff7808f5b842a0369d1cc76982138e92f7b2 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/queue/smoke/It_los_queue_105.c +++ b/testsuites/kernel/sample/kernel_base/ipc/queue/smoke/It_los_queue_105.c @@ -52,32 +52,37 @@ static UINT32 Testcase(VOID) ret = LOS_QueueWriteCopy(queueID, &buff1, QUEUE_SHORT_BUFFER_LENGTH, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - memset(buff2, 0, QUEUE_SHORT_BUFFER_LENGTH); + ret = memset_s(buff2, QUEUE_SHORT_BUFFER_LENGTH, 0, QUEUE_SHORT_BUFFER_LENGTH); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); ret = LOS_QueueRead(queueID, &buff2, QUEUE_SHORT_BUFFER_LENGTH, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); ret = LOS_QueueWriteCopy(queueID, &buff1, QUEUE_SHORT_BUFFER_LENGTH + PER_ADDED_VALUE, 0); ICUNIT_GOTO_EQUAL(ret, LOS_ERRNO_QUEUE_WRITE_SIZE_TOO_BIG, ret, EXIT); - memset(buff2, 0, QUEUE_SHORT_BUFFER_LENGTH); + ret = memset_s(buff2, QUEUE_SHORT_BUFFER_LENGTH, 0, QUEUE_SHORT_BUFFER_LENGTH); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); ret = LOS_QueueRead(queueID, &buff2, QUEUE_SHORT_BUFFER_LENGTH, 0); ICUNIT_GOTO_EQUAL(ret, LOS_ERRNO_QUEUE_ISEMPTY, ret, EXIT); ret = LOS_QueueWrite(queueID, &buff1, QUEUE_SHORT_BUFFER_LENGTH - 1, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - memset(buff2, 0, QUEUE_SHORT_BUFFER_LENGTH); + ret = memset_s(buff2, QUEUE_SHORT_BUFFER_LENGTH, 0, QUEUE_SHORT_BUFFER_LENGTH); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); ret = LOS_QueueRead(queueID, &buff2, QUEUE_SHORT_BUFFER_LENGTH, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - memset(buff2, 0, QUEUE_SHORT_BUFFER_LENGTH); + ret = memset_s(buff2, QUEUE_SHORT_BUFFER_LENGTH, 0, QUEUE_SHORT_BUFFER_LENGTH); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); ret = LOS_QueueRead(queueID, &buff2, QUEUE_SHORT_BUFFER_LENGTH, 0); ICUNIT_GOTO_EQUAL(ret, LOS_ERRNO_QUEUE_ISEMPTY, ret, EXIT); ret = LOS_QueueWrite(queueID, &buff1, 0, 0); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - memset(buff2, 0, QUEUE_SHORT_BUFFER_LENGTH); + ret = memset_s(buff2, QUEUE_SHORT_BUFFER_LENGTH, 0, QUEUE_SHORT_BUFFER_LENGTH); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); readSize = 0; ret = LOS_QueueReadCopy(queueID, &buff2, &readSize, 0); ICUNIT_GOTO_EQUAL(ret, LOS_ERRNO_QUEUE_READSIZE_IS_INVALID, ret, EXIT); diff --git a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_001.c b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_001.c index 5efd147e02febbb11ad17b4909be0ac0b96e21f9..9832354cc89034265a15f6e34d70d48bc3db80b8 100644 --- a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_001.c +++ b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_001.c @@ -71,7 +71,8 @@ static UINT32 Testcase(VOID) TSK_INIT_PARAM_S taskInitParam; UINT32 ret; - (VOID)memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ret = memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); taskInitParam.pfnTaskEntry = (TSK_ENTRY_FUNC)Task01; taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup001_task01"; @@ -84,7 +85,8 @@ static UINT32 Testcase(VOID) ret = LOS_TaskCreate(&g_testSmpCpupTaskID01, &taskInitParam); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - (VOID)memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ret = memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); taskInitParam.pfnTaskEntry = (TSK_ENTRY_FUNC)Task02; taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup001_task02"; diff --git a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_002.c b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_002.c index be0802cceaff96995696fdfa79cb4799e6126c46..51796a90e15b95cc599fb5cfcb40c86b85b332e0 100644 --- a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_002.c +++ b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_002.c @@ -63,7 +63,8 @@ static UINT32 Testcase(VOID) TSK_INIT_PARAM_S taskInitParam; UINT32 ret; - (VOID)memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ret = memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); taskInitParam.pfnTaskEntry = (TSK_ENTRY_FUNC)Task01; taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup002_task01"; diff --git a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_003.c b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_003.c index c3649397734bc32e27b4b60c1afe11513c1cd323..5f5f48278afc603384ef48b766cd06561de332d4 100644 --- a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_003.c +++ b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_003.c @@ -94,7 +94,8 @@ static UINT32 Testcase(VOID) TSK_INIT_PARAM_S taskInitParam; UINT32 ret; - (VOID)memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ret = memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); taskInitParam.pfnTaskEntry = (TSK_ENTRY_FUNC)Task01; taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup003_task01"; @@ -107,7 +108,8 @@ static UINT32 Testcase(VOID) ret = LOS_TaskCreate(&g_testSmpCpupTaskID01, &taskInitParam); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - (VOID)memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ret = memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); taskInitParam.pfnTaskEntry = (TSK_ENTRY_FUNC)Task02; taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup003_task02"; diff --git a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_004.c b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_004.c index 853a0643456c637434aa576d422cfda7ded7bf67..1dddcf6d6cbec698b5a26c766f05da02033d07f7 100644 --- a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_004.c +++ b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_004.c @@ -114,7 +114,8 @@ static UINT32 Testcase(VOID) TSK_INIT_PARAM_S taskInitParam; UINT32 ret; - (VOID)memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ret = memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); taskInitParam.pfnTaskEntry = (TSK_ENTRY_FUNC)Task01; taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup004_task01"; @@ -127,7 +128,8 @@ static UINT32 Testcase(VOID) ret = LOS_TaskCreate(&g_testSmpCpupTaskID01, &taskInitParam); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - (VOID)memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ret = memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); taskInitParam.pfnTaskEntry = (TSK_ENTRY_FUNC)Task02; taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup004_task02"; diff --git a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_005.c b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_005.c index 72d1267707d11ca72c9e8f3e8bca016c25a9cc02..2e938bd8b994ac58b5c7c65320dbb04285b6a08d 100644 --- a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_005.c +++ b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_005.c @@ -63,7 +63,8 @@ static void Task01(void) TSK_INIT_PARAM_S taskInitParam; UINT32 ret; - (VOID)memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ret = memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); taskInitParam.pfnTaskEntry = (TSK_ENTRY_FUNC)Task03; taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup005_task03"; @@ -74,7 +75,8 @@ static void Task01(void) ret = LOS_TaskCreate(&g_testSmpCpupTaskID03, &taskInitParam); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT2); - (VOID)memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ret = memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT2; taskInitParam.pfnTaskEntry = (TSK_ENTRY_FUNC)Task04; taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup005_task04"; @@ -137,7 +139,8 @@ static UINT32 Testcase(VOID) TSK_INIT_PARAM_S taskInitParam; UINT32 ret; - (VOID)memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ret = memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); taskInitParam.pfnTaskEntry = (TSK_ENTRY_FUNC)Task01; taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup005_task01"; @@ -150,7 +153,8 @@ static UINT32 Testcase(VOID) ret = LOS_TaskCreate(&g_testSmpCpupTaskID01, &taskInitParam); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - (VOID)memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ret = memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); taskInitParam.pfnTaskEntry = (TSK_ENTRY_FUNC)Task02; taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup005_task02"; diff --git a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_007.c b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_007.c index 4b401738742a700bc51641295352f476e65dd2fd..8780fd7ec407ee12e3c026f5ba7950f1231a5ea7 100644 --- a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_007.c +++ b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_007.c @@ -67,7 +67,8 @@ static UINT32 Testcase(VOID) TSK_INIT_PARAM_S taskInitParam; UINT32 ret; - (VOID)memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ret = memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); taskInitParam.pfnTaskEntry = (TSK_ENTRY_FUNC)Task01; taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup007_task01"; @@ -81,7 +82,8 @@ static UINT32 Testcase(VOID) ret = LOS_TaskCreate(&g_testSmpCpupTaskID01, &taskInitParam); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - (VOID)memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ret = memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); taskInitParam.pfnTaskEntry = (TSK_ENTRY_FUNC)Task02; taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup007_task02"; diff --git a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_008.c b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_008.c index 3a961ac96a57cb217b28228f8c7805a95d38ed98..6d0d34fc38d1f00375381217c07fdd2e822aa8ac 100644 --- a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_008.c +++ b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_008.c @@ -67,7 +67,8 @@ static UINT32 Testcase(VOID) TSK_INIT_PARAM_S taskInitParam; UINT32 ret; - (VOID)memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ret = memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); taskInitParam.pfnTaskEntry = (TSK_ENTRY_FUNC)Task01; taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup008_task01"; @@ -80,7 +81,8 @@ static UINT32 Testcase(VOID) ret = LOS_TaskCreate(&g_testSmpCpupTaskID01, &taskInitParam); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - (VOID)memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ret = memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); taskInitParam.pfnTaskEntry = (TSK_ENTRY_FUNC)Task02; taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup008_task02"; diff --git a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_009.c b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_009.c index 034ad59dbb65ec0f43f0d9440550e0e5cff4615c..811008dd21ecf4a66f9c104a20f8748a9ecc8d35 100644 --- a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_009.c +++ b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_009.c @@ -50,7 +50,8 @@ static void Task01(void) TSK_INIT_PARAM_S taskInitParam; UINT32 ret; - (VOID)memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ret = memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); taskInitParam.pfnTaskEntry = (TSK_ENTRY_FUNC)Task03; taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup009_task03"; @@ -90,7 +91,8 @@ static UINT32 Testcase(VOID) TSK_INIT_PARAM_S taskInitParam; UINT32 ret; - (VOID)memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ret = memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); taskInitParam.pfnTaskEntry = (TSK_ENTRY_FUNC)Task01; taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup009_task01"; @@ -104,7 +106,8 @@ static UINT32 Testcase(VOID) ret = LOS_TaskCreate(&g_testSmpCpupTaskID01, &taskInitParam); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - (VOID)memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ret = memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); taskInitParam.pfnTaskEntry = (TSK_ENTRY_FUNC)Task02; taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup009_task02"; diff --git a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_010.c b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_010.c index 3bcbb4b5f29ae50b95dc99efaf92e5e9f64fb6eb..fdace6ba62a315f992f62226c15c858053a1e6ab 100644 --- a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_010.c +++ b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_010.c @@ -69,7 +69,8 @@ static UINT32 Testcase(VOID) TSK_INIT_PARAM_S taskInitParam; UINT32 ret; - (VOID)memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ret = memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); taskInitParam.pfnTaskEntry = (TSK_ENTRY_FUNC)Task01; taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup001_task01"; @@ -83,7 +84,8 @@ static UINT32 Testcase(VOID) ret = LOS_TaskCreate(&g_testSmpCpupTaskID01, &taskInitParam); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - (VOID)memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ret = memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); taskInitParam.pfnTaskEntry = (TSK_ENTRY_FUNC)Task02; taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup001_task02"; diff --git a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_011.c b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_011.c index a4056e0eabc2d787cbdc9944d4913ce6e519a5bc..1219733b34800a125793ddcaf024108e7d54f1e7 100644 --- a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_011.c +++ b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_011.c @@ -90,7 +90,8 @@ static UINT32 Testcase(VOID) TSK_INIT_PARAM_S taskInitParam; UINT32 ret; - (VOID)memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ret = memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); taskInitParam.pfnTaskEntry = (TSK_ENTRY_FUNC)Task01; taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup001_task01"; @@ -103,7 +104,8 @@ static UINT32 Testcase(VOID) ret = LOS_TaskCreate(&g_testSmpCpupTaskID01, &taskInitParam); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - (VOID)memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ret = memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); taskInitParam.pfnTaskEntry = (TSK_ENTRY_FUNC)Task02; taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup001_task02"; diff --git a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_012.c b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_012.c index 42206fb7475958902ed695694bc73d3ff8447565..1b46c878c29f56ad531df96ac8396b16375f3b6a 100644 --- a/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_012.c +++ b/testsuites/kernel/sample/kernel_extend/cpup/smp/It_smp_extend_cpup_012.c @@ -73,7 +73,8 @@ static UINT32 Testcase(VOID) ret = LOS_EventInit(&g_eventCB); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT0); - (VOID)memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ret = memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT0); taskInitParam.pfnTaskEntry = (TSK_ENTRY_FUNC)Task01; taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup001_task01"; @@ -86,7 +87,8 @@ static UINT32 Testcase(VOID) ret = LOS_TaskCreate(&g_testSmpCpupTaskID01, &taskInitParam); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - (VOID)memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ret = memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT1); taskInitParam.pfnTaskEntry = (TSK_ENTRY_FUNC)Task02; taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; taskInitParam.pcName = "SmpCpup001_task02"; diff --git a/testsuites/kernel/src/iCunit.c b/testsuites/kernel/src/iCunit.c index 82a0065172a2e50f177219585fb045519b82565b..c405161999c2c8c0e5716f0ad8f2b69069a1e6c7 100644 --- a/testsuites/kernel/src/iCunit.c +++ b/testsuites/kernel/src/iCunit.c @@ -194,7 +194,7 @@ iUINT32 ICunitInit(void) g_iCunitCaseCnt = 0x0000; g_iCunitCaseFailedCnt = 0; g_iCunitErrLogAddCase = 0; - memset(g_iCunitCaseArray, 0, sizeof(g_iCunitCaseArray)); + (void)memset_s(g_iCunitCaseArray, sizeof(g_iCunitCaseArray), 0, sizeof(g_iCunitCaseArray)); g_iCunitCaseRun = 1; return (iUINT32)ICUNIT_SUCCESS; @@ -233,12 +233,12 @@ iUINT32 ICunitRunF(ICUNIT_CASE_S *psubCase) static LosSemCB *semNode; UINT32 muxCnt[ARRAY_SIZE]; - memset(gUwSwtNum, 0, sizeof(gUwSwtNum)); - memset(gUwHwiNum, 0, sizeof(gUwHwiNum)); - memset(gUwTskNum, 0, sizeof(gUwTskNum)); - memset(gAuwMemuse, 0, sizeof(gAuwMemuse)); - memset(gUwQueueNum, 0, sizeof(gUwQueueNum)); - memset(gUwSemNum, 0, sizeof(gUwSemNum)); + (void)memset_s(gUwSwtNum, sizeof(gUwSwtNum), 0, sizeof(gUwSwtNum)); + (void)memset_s(gUwHwiNum, sizeof(gUwHwiNum), 0, sizeof(gUwHwiNum)); + (void)memset_s(gUwTskNum, sizeof(gUwTskNum), 0, sizeof(gUwTskNum)); + (void)memset_s(gAuwMemuse, sizeof(gAuwMemuse), 0, sizeof(gAuwMemuse)); + (void)memset_s(gUwQueueNum, sizeof(gUwQueueNum), 0, sizeof(gUwQueueNum)); + (void)memset_s(gUwSemNum, sizeof(gUwSemNum), 0, sizeof(gUwSemNum)); curTestTaskID = LOS_CurTaskIDGet(); @@ -577,7 +577,7 @@ iUINT32 ICunitRunTestArrayRandom(iUINT32 testcaseNum, iUINT32 testcaseLayer, iUI iUINT32 failedCount; iUINT32 successCount; - memset(&subCaseArrayTemp, 0, sizeof(ICUNIT_CASE_S)); + (void)memset_s(&subCaseArrayTemp, sizeof(ICUNIT_CASE_S), 0, sizeof(ICUNIT_CASE_S)); idx1 = g_iCunitCaseCnt; @@ -586,7 +586,7 @@ iUINT32 ICunitRunTestArrayRandom(iUINT32 testcaseNum, iUINT32 testcaseLayer, iUI successCount = g_passResult; for (idx = idx1 - 1; idx > 1; idx--) { - memset(&subCaseArrayTemp, 0, sizeof(ICUNIT_CASE_S)); + (void)memset_s(&subCaseArrayTemp, sizeof(ICUNIT_CASE_S), 0, sizeof(ICUNIT_CASE_S)); randIdx = ICunitRand() % idx; subCaseArrayTemp = g_iCunitCaseArray[randIdx]; @@ -611,12 +611,12 @@ iUINT32 ICunitRunTestOne(const char *tcId) iUINT32 idx1; ICUNIT_CASE_S subCaseArrayTemp; - memset(&subCaseArrayTemp, 0, sizeof(ICUNIT_CASE_S)); + (void)memset_s(&subCaseArrayTemp, sizeof(ICUNIT_CASE_S), 0, sizeof(ICUNIT_CASE_S)); idx1 = g_iCunitCaseCnt; for (idx = 0; idx < idx1; idx++) { - memset(&subCaseArrayTemp, 0, sizeof(ICUNIT_CASE_S)); + (void)memset_s(&subCaseArrayTemp, sizeof(ICUNIT_CASE_S), 0, sizeof(ICUNIT_CASE_S)); subCaseArrayTemp = g_iCunitCaseArray[idx]; if (strcmp(subCaseArrayTemp.pcCaseID, tcId) == 0) { diff --git a/testsuites/unittest/drivers/hid/smoke/hid_test_001.cpp b/testsuites/unittest/drivers/hid/smoke/hid_test_001.cpp index d78847103bb9a1f4678b7a384b16167c1fc1bb4f..6057c3cae175f99dc5c061fb6cbdf5421bde8acb 100644 --- a/testsuites/unittest/drivers/hid/smoke/hid_test_001.cpp +++ b/testsuites/unittest/drivers/hid/smoke/hid_test_001.cpp @@ -55,7 +55,8 @@ static int Testcase(VOID) buf = (char *)malloc(MOUSE_DATA_LEN); ICUNIT_ASSERT_NOT_EQUAL(buf, NULL, buf); - (void)memset_s(buf, MOUSE_DATA_LEN, 0, MOUSE_DATA_LEN); + ret = memset_s(buf, MOUSE_DATA_LEN, 0, MOUSE_DATA_LEN); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); ret = ioctl(fd, USB_GET_REPORT_ID, &id); ICUNIT_ASSERT_NOT_EQUAL(ret, -1, ret); diff --git a/testsuites/unittest/drivers/storage/smoke/storage_test_001.cpp b/testsuites/unittest/drivers/storage/smoke/storage_test_001.cpp index 9e35c78f9288945dd721ada56a86b208cd167077..6b2ed769c790e89f3f4ae74b3634f333b1609168 100644 --- a/testsuites/unittest/drivers/storage/smoke/storage_test_001.cpp +++ b/testsuites/unittest/drivers/storage/smoke/storage_test_001.cpp @@ -53,7 +53,8 @@ static int Testcase(VOID) buf = (char *)malloc(STORAGE_DATA_LEN); ICUNIT_ASSERT_NOT_EQUAL(buf, NULL, buf); - (void)memset_s(buf, STORAGE_DATA_LEN, 0, STORAGE_DATA_LEN); + ret = memset_s(buf, STORAGE_DATA_LEN, 0, STORAGE_DATA_LEN); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); ret = ioctl(fd, DIOC_GETPRIV, &bch); printf("bch = %#x, &bch = %#x, errno = %d\n", bch, &bch, errno); diff --git a/testsuites/unittest/extended/liteipc/smgr_demo.cpp b/testsuites/unittest/extended/liteipc/smgr_demo.cpp index 1695b914dfaaad2b1e6a3a6dab391349973be1bf..9c49d25c5a0ab1380e6ab4c89073390f9e248ad7 100644 --- a/testsuites/unittest/extended/liteipc/smgr_demo.cpp +++ b/testsuites/unittest/extended/liteipc/smgr_demo.cpp @@ -48,7 +48,7 @@ BOOL g_cmsRunningFlag = FALSE; static void InitCms() { - memset(g_serviceNameMap, 0, sizeof(g_serviceNameMap)); + (void)memset_s(g_serviceNameMap, sizeof(g_serviceNameMap), 0, sizeof(g_serviceNameMap)); } uint32_t SetCms(int fd) @@ -66,7 +66,7 @@ void SendReply(int fd, IpcMsg *dataIn, uint32_t result, uint32_t serviceHandle) data1.flag = SEND | BUFF_FREE; data1.buffToFree = dataIn; data1.outMsg = &dataOut; - memset(data1.outMsg, 0, sizeof(IpcMsg)); + (void)memset_s(data1.outMsg, sizeof(IpcMsg), 0, sizeof(IpcMsg)); data1.outMsg->type = MT_REPLY; data1.outMsg->target.handle = dataIn->taskID; data1.outMsg->target.token = dataIn->target.token; @@ -118,12 +118,12 @@ uint32_t RegService(int fd, char *serviceName, uint32_t nameLen, uint32_t *servi if (nameLen > NAME_LEN_MAX) { return -1; } - memcpy(name.serviceName, serviceName, nameLen); + (void)memcpy_s(name.serviceName, nameLen, serviceName, nameLen); name.nameLen = nameLen; data1.flag = SEND | RECV; data1.outMsg = &dataOut; - memset(data1.outMsg, 0, sizeof(IpcMsg)); + (void)memset_s(data1.outMsg, sizeof(IpcMsg), 0, sizeof(IpcMsg)); data1.outMsg->type = MT_REQUEST; data1.outMsg->target.handle = 0; data1.outMsg->code = REG_CODE; @@ -153,12 +153,12 @@ uint32_t GetService(int fd, char *serviceName, uint32_t nameLen, uint32_t *servi if (nameLen > NAME_LEN_MAX) { return -1; } - memcpy(name.serviceName, serviceName, nameLen); + (void)memcpy_s(name.serviceName, nameLen, serviceName, nameLen); name.nameLen = nameLen; data1.flag = SEND | RECV; data1.outMsg = &dataOut; - memset(data1.outMsg, 0, sizeof(IpcMsg)); + (void)memset_s(data1.outMsg, sizeof(IpcMsg), 0, sizeof(IpcMsg)); data1.outMsg->type = MT_REQUEST; data1.outMsg->target.handle = 0; data1.outMsg->code = GET_CODE; @@ -210,7 +210,8 @@ static void HandleServiceRegAndGet(int fd, IpcMsg *data) printf("the task has already a service named:%s\n", g_serviceNameMap[content.serviceHandle].serviceName); goto ERROR_REG; } else { - (void)memcpy_s(g_serviceNameMap[content.serviceHandle].serviceName, info->nameLen, info->serviceName, info->nameLen); + (void)memcpy_s(g_serviceNameMap[content.serviceHandle].serviceName, info->nameLen, + info->serviceName, info->nameLen); g_serviceNameMap[content.serviceHandle].nameLen = info->nameLen; SendReply(fd, data, 0, content.serviceHandle); } @@ -281,7 +282,7 @@ void StopCms(int fd) data1.flag = SEND; data1.outMsg = &dataOut; - memset(data1.outMsg, 0, sizeof(IpcMsg)); + (void)memset_s(data1.outMsg, sizeof(IpcMsg), 0, sizeof(IpcMsg)); data1.outMsg->type = MT_REQUEST; data1.outMsg->target.handle = 0; data1.outMsg->code = STOP_CODE; diff --git a/testsuites/unittest/extended/liteipc/smoke/liteipc_test_002.cpp b/testsuites/unittest/extended/liteipc/smoke/liteipc_test_002.cpp index 4c397ba52a85ebe46a54bee604e15fdfc4f8d94a..ba8531d225195e316d5b6c12dc9d5054a2bb4027 100644 --- a/testsuites/unittest/extended/liteipc/smoke/liteipc_test_002.cpp +++ b/testsuites/unittest/extended/liteipc/smoke/liteipc_test_002.cpp @@ -78,7 +78,7 @@ static int CallTestServiceLoop(uint32_t id) #endif data1.flag = SEND | RECV; data1.outMsg = &dataOut; - memset(data1.outMsg, 0, sizeof(IpcMsg)); + (void)memset_s(data1.outMsg, sizeof(IpcMsg), 0, sizeof(IpcMsg)); data1.outMsg->type = MT_REQUEST; data1.outMsg->target.handle = serviceHandle; data1.outMsg->dataSz = 4; @@ -98,7 +98,7 @@ static int CallTestServiceLoop(uint32_t id) char tmpBuff[2048]; data1.flag = SEND | RECV; data1.outMsg = &dataOut; - memset(data1.outMsg, 0, sizeof(IpcMsg)); + (void)memset_s(data1.outMsg, sizeof(IpcMsg), 0, sizeof(IpcMsg)); data1.outMsg->type = MT_REQUEST; data1.outMsg->target.handle = serviceHandle; data1.outMsg->dataSz = 1024; diff --git a/testsuites/unittest/extended/signal/full/It_ipc_pipe_002.cpp b/testsuites/unittest/extended/signal/full/It_ipc_pipe_002.cpp index be0e257895ce91b939ef5a3fd5567b7d4a7a12b9..58243b5227f4f853f0359be4eb6e2bb8ce15367e 100644 --- a/testsuites/unittest/extended/signal/full/It_ipc_pipe_002.cpp +++ b/testsuites/unittest/extended/signal/full/It_ipc_pipe_002.cpp @@ -37,7 +37,7 @@ static UINT32 Testcase(VOID) char buffer[20]; // 20, target buffer size int *sharedflag = NULL; int shmid; - + ret = pipe(pipeFd); ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT1); shmid = shmget((key_t)IPC_PRIVATE, sizeof(int), 0666 | IPC_CREAT); // 0666 the authority of the shm diff --git a/testsuites/unittest/extended/signal/full/pipe_test_001.cpp b/testsuites/unittest/extended/signal/full/pipe_test_001.cpp index fe13fd1d01abe1276f0da91d81ddade2f1e59530..8e24b37087b62a18e090a0065e6610d3e1f5a01b 100644 --- a/testsuites/unittest/extended/signal/full/pipe_test_001.cpp +++ b/testsuites/unittest/extended/signal/full/pipe_test_001.cpp @@ -59,12 +59,12 @@ int TestPipeSingleProcess() char sentence1[15] = "Hello World"; char a[4] = {0}; (void)sprintf_s(a, sizeof(a), "%d", i); - strcat(sentence1, a); + (void)strcat_s(sentence1, 15, a); // 15, sizeof sentence1 int ret = write(*writeFd, sentence1, strlen(sentence1) + 1); usleep(100000); // 100000, Used to calculate the delay time. printf("read\n"); - memset(readbuffer, 0, sizeof(readbuffer)); + (void)memset_s(readbuffer, sizeof(readbuffer), 0, sizeof(readbuffer)); retValue = read(*readFd, readbuffer, sizeof(readbuffer)); printf("Receive %d bytes data : %s,%d\n", retValue, readbuffer, errno); if (strncmp((readbuffer), (readbuffer), (strlen(sentence1))) != 0) { diff --git a/testsuites/unittest/extended/signal/full/pipe_test_003.cpp b/testsuites/unittest/extended/signal/full/pipe_test_003.cpp index 6c76e23b460004e24f7e6c1648ab4234493f6e2f..03d5eafd875c7ec09a4a57037c5aa79e6ae392bc 100644 --- a/testsuites/unittest/extended/signal/full/pipe_test_003.cpp +++ b/testsuites/unittest/extended/signal/full/pipe_test_003.cpp @@ -59,7 +59,7 @@ int TestPipeSingleProcessFcntl() char sentence1[15] = "Hello World"; char a[4] = {0}; (void)sprintf_s(a, sizeof(a), "%d", i); - strcat(sentence1, a); + (void)strcat_s(sentence1, 15, a); // 15, sizeof sentence1 int ret = write(*writeFd, sentence1, strlen(sentence1) + 1); usleep(100000); // 100000, Used to calculate the delay time. } @@ -67,7 +67,7 @@ int TestPipeSingleProcessFcntl() char a[4] = {0}; usleep(10000); // 10000, Used to calculate the delay time. printf("read\n"); - memset(readbuffer, 0, sizeof(readbuffer)); + (void)memset_s(readbuffer, sizeof(readbuffer), 0, sizeof(readbuffer)); retValue = read(*readFd, readbuffer, sizeof(readbuffer)); printf("Receive %d bytes data : %s,%d\n", retValue, readbuffer, errno); printf("Receive %d bytes data : %s,%d\n", retValue, readbuffer + 13, errno); // 13, readbuffer offset. @@ -78,7 +78,7 @@ int TestPipeSingleProcessFcntl() usleep(100000); // 100000, Used to calculate the delay time. printf("read\n"); - memset(readbuffer, 0, sizeof(readbuffer)); + (void)memset_s(readbuffer, sizeof(readbuffer), 0, sizeof(readbuffer)); fcntl(*readFd, F_SETFL, O_NONBLOCK); ret = fcntl(*readFd, F_GETFL, O_NONBLOCK); printf("fctrl ret=%d,O_NONBLOCK=%d\n", ret, O_NONBLOCK); diff --git a/testsuites/unittest/extended/signal/full/pipe_test_006.cpp b/testsuites/unittest/extended/signal/full/pipe_test_006.cpp index c0da9ea7ab73253b751e7f49d618c7b6fe13ad1e..3bd8e54a79c62001b6d1e314817b310cfb731c42 100644 --- a/testsuites/unittest/extended/signal/full/pipe_test_006.cpp +++ b/testsuites/unittest/extended/signal/full/pipe_test_006.cpp @@ -31,6 +31,8 @@ #include "it_test_signal.h" #include "signal.h" +static const int NAME_LEN = 60; + static const int MAX_PIPES = 32; static int PipeUnlinkTest() @@ -41,7 +43,7 @@ static int PipeUnlinkTest() int retValue = -1; int status, ret; - char devName[60]; // 60, array subscript + char devName[NAME_LEN]; // 60, array subscript pid = fork(); if (pid == -1) { printf("Fork Error!\n"); @@ -54,7 +56,7 @@ static int PipeUnlinkTest() retValue = pipe(tmpFd); ICUNIT_ASSERT_EQUAL_EXIT(retValue, -1, __LINE__); for (int i = 0; i < MAX_PIPES; i++) { - snprintf(devName, 60, "/dev/pipe%d", i); // 60, len of max size + (void)snprintf_s(devName, NAME_LEN, NAME_LEN - 1, "/dev/pipe%d", i); // 60, len of max size retValue = unlink(devName); ICUNIT_ASSERT_EQUAL_EXIT(retValue, -1, __LINE__); retValue = close(pipefd[i][0]); diff --git a/testsuites/unittest/extended/signal/smoke/pipe_test_002.cpp b/testsuites/unittest/extended/signal/smoke/pipe_test_002.cpp index f25af5e5bab13cd4dd6db70da08c3bf1af637747..c3de50008c777de7600db032d5ee3df53de92b8f 100644 --- a/testsuites/unittest/extended/signal/smoke/pipe_test_002.cpp +++ b/testsuites/unittest/extended/signal/smoke/pipe_test_002.cpp @@ -68,7 +68,7 @@ static int TestPipeMultiProcess() char sentence1[15] = "Hello World"; char a[2] = {0}; (void)sprintf_s(a, sizeof(a), "%d", i); - strcat(sentence1, a); + (void)strcat_s(sentence1, 15, a); // 15, sizeof sentence1 int ret = write(*writeFd, sentence1, strlen(sentence1) + 1); ICUNIT_ASSERT_EQUAL(ret, strlen(sentence1) + 1, ret); usleep(10000); // 10000, Used to calculate the delay time. @@ -88,8 +88,8 @@ static int TestPipeMultiProcess() char sentence1[15] = "Hello World"; char a[2] = {0}; (void)sprintf_s(a, sizeof(a), "%d", i); - strcat(sentence1, a); - memset(readbuffer, 0, sizeof(readbuffer)); + (void)strcat_s(sentence1, 15, a); // 15, sizeof sentence1 + (void)memset_s(readbuffer, sizeof(readbuffer), 0, sizeof(readbuffer)); retValue = read(*readFd, readbuffer, strlen(sentence1) + 1); printf("Receive %d bytes data : %s, errno : %d\n", retValue, readbuffer, errno); ICUNIT_ASSERT_SIZE_STRING_EQUAL(readbuffer, sentence1, strlen(sentence1), errno); diff --git a/testsuites/unittest/libc/io/full/IO_test_epoll_001.cpp b/testsuites/unittest/libc/io/full/IO_test_epoll_001.cpp index ecdca93a644906b83e712d53ec01547bf2c9f531..e3e8fe8671e35fee71b9a8b55a15a0ee53f26ecd 100644 --- a/testsuites/unittest/libc/io/full/IO_test_epoll_001.cpp +++ b/testsuites/unittest/libc/io/full/IO_test_epoll_001.cpp @@ -51,6 +51,7 @@ static UINT32 testcase(VOID) sigset_t mask; struct epoll_event ev; struct epoll_event evWait[2]; /* 2, evs num */ + UINT32 ret; retval = pipe(pipeFd); ICUNIT_GOTO_EQUAL(retval, 0, retval, OUT); @@ -71,7 +72,8 @@ static UINT32 testcase(VOID) if (pid == 0) { close(pipeFd[1]); - memset(evWait, 0, sizeof(struct epoll_event) * 2); /* 2, evs num */ + ret = memset_s(evWait, sizeof(struct epoll_event) * 2, 0, sizeof(struct epoll_event) * 2); /* 2, evs num */ + ICUNIT_ASSERT_EQUAL(ret, 0, ret); retval = epoll_wait(epFd, evWait, 2, 3000); /* 2, num of wait fd. 3000, wait time */ close(pipeFd[0]); diff --git a/testsuites/unittest/libc/io/full/IO_test_epoll_002.cpp b/testsuites/unittest/libc/io/full/IO_test_epoll_002.cpp index 8b54bdcd82afe5fb06c53db607907f853b6134f1..1c59173e898a4a9db802124b15885fdacbd4de0f 100644 --- a/testsuites/unittest/libc/io/full/IO_test_epoll_002.cpp +++ b/testsuites/unittest/libc/io/full/IO_test_epoll_002.cpp @@ -97,7 +97,7 @@ static UINT32 testcase(VOID) if (pid == 0) { close(pipeFd[1]); - memset(evWait, 0, sizeof(struct epoll_event) * 2); /* 2, evs num */ + (void)memset_s(evWait, sizeof(struct epoll_event) * 2, 0, sizeof(struct epoll_event) * 2); /* 2, evs num */ evWait[0].data.fd = pipeFd[0]; retval = epoll_pwait(epFd, evWait, 2, 3000, &mask); /* 2, num of wait fd. 3000, wait time */ diff --git a/testsuites/unittest/libc/io/full/It_stdio_fputws_001.cpp b/testsuites/unittest/libc/io/full/It_stdio_fputws_001.cpp index 58011cd13c6e0113f0c4c790a67bf5ac7191fcef..1ada98da96c26b263104a634e3838528683d7f28 100644 --- a/testsuites/unittest/libc/io/full/It_stdio_fputws_001.cpp +++ b/testsuites/unittest/libc/io/full/It_stdio_fputws_001.cpp @@ -40,9 +40,13 @@ static UINT32 Testcase(VOID) int nType; char pathname[50]; // 50, path name buffer size FILE *testFile; - (void)strncpy_s(pathname, 50, g_ioTestPath, 50); // 50, path name buffer size + int ret; + + ret = strncpy_s(pathname, 50, g_ioTestPath, 50); // 50, path name buffer size + ICUNIT_ASSERT_EQUAL(ret, 0, ret); char *filename = "/crtfputwstest1"; - strcat(pathname, filename); + ret = strcat_s(pathname, 50, filename); // 50, path name buffer size + ICUNIT_ASSERT_EQUAL(ret, EOK, ret); for (nType = 0; nType < 6; nType++) { // 6, test loop num testFile = fopen(pathname, "a"); diff --git a/testsuites/unittest/libc/io/full/It_stdio_fwprintf_001.cpp b/testsuites/unittest/libc/io/full/It_stdio_fwprintf_001.cpp index 1bf571149ac3808fa09ac0b40e09557ead7378a8..fbafa1bd420a4f320da75b22eecce9cfdc433cf8 100644 --- a/testsuites/unittest/libc/io/full/It_stdio_fwprintf_001.cpp +++ b/testsuites/unittest/libc/io/full/It_stdio_fwprintf_001.cpp @@ -38,12 +38,14 @@ static UINT32 Testcase(VOID) int nRet; unsigned int nPos; int nType; - char pathname[50]; // 50, path name buffer size - strncpy(pathname, g_ioTestPath, 50); // 50, path name buffer size + char pathname[50]; // 50, path name buffer size + (void)strncpy_s(pathname, 50, g_ioTestPath, 50); // 50, path name buffer size char *filename = "/crtfwprintftest1"; FILE *testFile = NULL; + int ret; - strcat(pathname, filename); + ret = strcat_s(pathname, 50, filename); // 50, path name buffer size + ICUNIT_ASSERT_EQUAL(ret, EOK, ret); for (nType = 0; nType < 6; nType++) { // 6, loop test num testFile = fopen(pathname, "w+"); @@ -52,7 +54,7 @@ static UINT32 Testcase(VOID) nPos = (unsigned int)ftell(testFile); nRet = fwprintf(testFile, L"hello world %d", 666); // 666, for test, print to testFile - ICUNIT_GOTO_EQUAL(nRet, 15, nRet, EXIT); // 15， total write size + ICUNIT_GOTO_EQUAL(nRet, 15, nRet, EXIT); // 15， total write size if ((nPos + 15) != (unsigned int)ftell(testFile)) { // 15， total write size ICUNIT_GOTO_EQUAL(1, 0, 1, EXIT); diff --git a/testsuites/unittest/libc/io/full/It_stdio_getc_unlocked_001.cpp b/testsuites/unittest/libc/io/full/It_stdio_getc_unlocked_001.cpp index cd10d71e5deafc714fe5bea09e762a233bb0fc93..86b8757818730267539df1a0453ab3cb316a90bb 100644 --- a/testsuites/unittest/libc/io/full/It_stdio_getc_unlocked_001.cpp +++ b/testsuites/unittest/libc/io/full/It_stdio_getc_unlocked_001.cpp @@ -37,11 +37,15 @@ static UINT32 Testcase(VOID) unsigned int nPos; int ret; char pathname[50]; // 50, enough space. - (void)strncpy_s(pathname, sizeof(pathname), g_ioTestPath, sizeof(pathname)); char *filename = "/crt_getc_unlocked_test1"; FILE *testFile = NULL; - strcat(pathname, filename); + ret = strncpy_s(pathname, sizeof(pathname), g_ioTestPath, sizeof(pathname)); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); + + ret = strcat_s(pathname, 50, filename); // 50, path name buffer size + ICUNIT_ASSERT_EQUAL(ret, EOK, ret); + testFile = fopen(pathname, "w+"); ICUNIT_ASSERT_NOT_EQUAL(testFile, NULL, LOS_NOK); ret = fputs("0123456789abcdefghijklmnopqrstuvwxyz", testFile); diff --git a/testsuites/unittest/libc/io/full/It_stdio_mbrlen_001.cpp b/testsuites/unittest/libc/io/full/It_stdio_mbrlen_001.cpp index da1c3fd0a83bafe6ca22ac5f947207b14864d1aa..ed59e2ce254fcbb90b127777af5654336032ba8b 100644 --- a/testsuites/unittest/libc/io/full/It_stdio_mbrlen_001.cpp +++ b/testsuites/unittest/libc/io/full/It_stdio_mbrlen_001.cpp @@ -38,9 +38,11 @@ static UINT32 Testcase(VOID) const char *str = "水"; size_t sz = strlen(str); int len1, len2, len3; + UINT32 ret; mbstate_t mb; - memset(&mb, 0, sizeof(mb)); + ret = memset_s(&mb, sizeof(mb), 0, sizeof(mb)); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); len1 = mbrlen(str, 1, &mb); ICUNIT_GOTO_EQUAL(len1, -2, len1, EXIT); // -2, except return value diff --git a/testsuites/unittest/libc/io/full/It_stdio_putwc_001.cpp b/testsuites/unittest/libc/io/full/It_stdio_putwc_001.cpp index a36673857e851f8bdeb9a37e8c02c3b8b76acb88..7767447bb565763ff1895eb0f27b28b553e8ea04 100644 --- a/testsuites/unittest/libc/io/full/It_stdio_putwc_001.cpp +++ b/testsuites/unittest/libc/io/full/It_stdio_putwc_001.cpp @@ -38,11 +38,15 @@ static UINT32 Testcase(VOID) long nPos; int nType, i; FILE *putwcFile = NULL; - char pathname[50]; // 50, pathname size - strncpy(pathname, g_ioTestPath, 50); // 50, pathname size + char pathname[50]; // 50, pathname size char *filename = "/crtputwctest1"; + int ret; - strcat(pathname, filename); + ret = strncpy_s(pathname, 50, g_ioTestPath, 50); // 50, pathname size + ICUNIT_ASSERT_EQUAL(ret, 0, ret); + + ret = strcat_s(pathname, 50, filename); // 50, path name buffer size + ICUNIT_ASSERT_EQUAL(ret, EOK, ret); for (nType = 0; nType < 6; nType++) { // 6, loop test num putwcFile = fopen(pathname, "w+"); diff --git a/testsuites/unittest/libc/io/full/It_stdio_readv_001.cpp b/testsuites/unittest/libc/io/full/It_stdio_readv_001.cpp index 78eebb9106db2201b3b82e83d268a16e9a334677..6af0103b6ad8f4a8e0e195af1783b5de0ec30b48 100644 --- a/testsuites/unittest/libc/io/full/It_stdio_readv_001.cpp +++ b/testsuites/unittest/libc/io/full/It_stdio_readv_001.cpp @@ -41,14 +41,16 @@ static UINT32 Testcase(VOID) struct iovec iov[2]; // 2, read 2 block ssize_t nread; const int testStrLen = 10; + UINT32 ret; iov[0].iov_base = buf1; iov[0].iov_len = sizeof(buf1) - 1; iov[1].iov_base = buf2; iov[1].iov_len = sizeof(buf2) - 1; - strncpy(pathname, g_ioTestPath, 50); // 50, path name size - strcat(pathname, filename); + (void)strncpy_s(pathname, 50, g_ioTestPath, 50); // 50, path name size + ret = strcat_s(pathname, 50, filename); // 50, path name buffer size + ICUNIT_ASSERT_EQUAL(ret, EOK, ret); fd = open(pathname, O_CREAT | O_RDWR | O_TRUNC, 0666); // 0666, file authority if (fd < 0) { printf("error: can`t open file\n"); diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_002.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_002.cpp index d7507a1bd53a0e3044874982d4f74aa2cbdbada8..acd84131af1d7b726b2206d3e9dc8ff355c6cd40 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_002.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_002.cpp @@ -42,7 +42,9 @@ static UINT32 Testcase(VOID) attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = 1; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq002_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, + "/mq002_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); @@ -66,6 +68,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_005.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_005.cpp index eace9af23324d15af75cba4c6cf42fcc9dbcf46f..cafbc621d9a88f32e516d879b06a00dd1c758744 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_005.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_005.cpp @@ -32,10 +32,13 @@ static UINT32 Testcase(VOID) { + INT32 ret; CHAR mqname[MQUEUE_STANDARD_NAME_LENGTH] = ""; mqd_t mqueue; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq005_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, + "/mq005_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); mqueue = mq_open(mqname, O_RDWR, S_IRUSR | S_IWUSR, NULL); ICUNIT_GOTO_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT); ICUNIT_ASSERT_EQUAL(errno, ENOENT, errno); @@ -45,6 +48,7 @@ static UINT32 Testcase(VOID) EXIT: mq_close(mqueue); mq_unlink(mqname); +EXIT1: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_008.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_008.cpp index aa888e9c3f62a1267ad81e6494d5fc39e8ce9905..ecc6d19aad7885b2ca26b7bdea06173ff6620ea1 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_008.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_008.cpp @@ -36,8 +36,10 @@ static UINT32 Testcase(VOID) CHAR mqname[MQUEUE_STANDARD_NAME_LENGTH] = ""; mqd_t roqueue, roqueue2; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq008_%d", LosCurTaskIDGet()); - + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, + "/mq008_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); + roqueue = mq_open(mqname, O_CREAT | O_RDONLY, S_IRUSR | S_IWUSR, NULL); ICUNIT_GOTO_NOT_EQUAL(roqueue, (mqd_t)-1, roqueue, EXIT); @@ -59,6 +61,7 @@ EXIT1: EXIT: mq_close(roqueue); mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_011.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_011.cpp index 53f8df2738a1985391ddb437727e028dfd328ce6..313ad83d38315ae7a64fef0472b82e2340da6f8a 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_011.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_011.cpp @@ -40,8 +40,10 @@ static UINT32 Testcase(VOID) mqd_t rdwrqueue, rdwrqueue2; struct mq_attr attr = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq011_%d", LosCurTaskIDGet()); - + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, + "/mq011_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); + attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; rdwrqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); @@ -77,6 +79,7 @@ EXIT1: EXIT: mq_close(rdwrqueue); mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_013.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_013.cpp index f5b8698ec5329e68b85933a52478d4cf5af5f8f3..65f1c4fcdddd9302b1b73dcb61c0199f36bd1436 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_013.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_013.cpp @@ -37,8 +37,10 @@ static UINT32 Testcase(VOID) const CHAR *msgptr = MQUEUE_SEND_STRING_TEST; mqd_t mqueue1, mqueue2; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq013_%d", LosCurTaskIDGet()); - + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, + "/mq013_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT3); + mqueue1 = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, NULL); ICUNIT_GOTO_NOT_EQUAL(mqueue1, (mqd_t)-1, mqueue1, EXIT1); @@ -67,6 +69,7 @@ EXIT1: mq_close(mqueue1); EXIT: mq_unlink(mqname); +EXIT3: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_014.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_014.cpp index b124f1817c2a7afc80f8a18b6cf0743698febf1b..5a62f1ff2aae50549288bcc939a73353262b7ea4 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_014.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_014.cpp @@ -37,7 +37,9 @@ static UINT32 Testcase(VOID) mqd_t mqueue; struct mq_attr attr = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq014_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, + "/mq014_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, NULL); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); @@ -60,6 +62,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_015.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_015.cpp index 5bc45d9c020505e440f20e5128463ecfce65ac69..2da68d5e1e85fcfbf9c3f946a3f528fc9b5d25cd 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_015.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_015.cpp @@ -38,7 +38,9 @@ static UINT32 Testcase(VOID) struct mq_attr attr = { 0 }; struct mq_attr attrget; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq015_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, + "/mq015_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); attr.mq_maxmsg = MQUEUE_SHORT_ARRAY_LENGTH; attr.mq_msgsize = 5; // 5, queue message size. @@ -67,6 +69,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_016.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_016.cpp index 2a464695e678657b3376b25986262bf051441b21..ca5ea520453ba30d73afbf0f349d3e601fe80d48 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_016.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_016.cpp @@ -36,8 +36,10 @@ static UINT32 Testcase(VOID) CHAR mqname[MQUEUE_STANDARD_NAME_LENGTH] = ""; mqd_t mqueue1, mqueue2; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq016_%d", LosCurTaskIDGet()); - + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, + "/mq016_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT3); + mqueue1 = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, NULL); ICUNIT_GOTO_NOT_EQUAL(mqueue1, (mqd_t)-1, mqueue1, EXIT1); @@ -57,6 +59,7 @@ EXIT1: mq_close(mqueue1); EXIT: mq_unlink(mqname); +EXIT3: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_018.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_018.cpp index 924bf87cb08e8a7457b474e101e6ee87935c8016..81aa005bf486829d0b1619b297a0dfc715d5718b 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_018.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_018.cpp @@ -37,7 +37,9 @@ static UINT32 Testcase(VOID) const CHAR *msgptr = MQUEUE_SEND_STRING_TEST; mqd_t mqueue; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq018_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, + "/mq018_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_RDWR | O_NONBLOCK, S_IRUSR | S_IWUSR, NULL); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); @@ -56,6 +58,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_019.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_019.cpp index a6a4b253e657d595fa2ddf88a8a8296100ceecef..3b54987cd57c11aef3897ee6c7ddc844350c9ef7 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_019.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_019.cpp @@ -39,7 +39,9 @@ static UINT32 Testcase(VOID) mqd_t mqueue1, mqueue2; struct mq_attr attr = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq019_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, + "/mq019_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT3); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; @@ -76,6 +78,7 @@ EXIT1: mq_close(mqueue1); EXIT: mq_unlink(mqname); +EXIT3: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_020.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_020.cpp index e24f1a8de1da09070fe4a191291876dd7f7ebd23..0de5d6692cacf9fe124b1eb4f83f489a00d8ca54 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_020.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_020.cpp @@ -38,7 +38,9 @@ static UINT32 Testcase(VOID) struct sigevent ev; struct sigaction act; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq020_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, + "/mq020_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, NULL); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); @@ -54,6 +56,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_021.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_021.cpp index 24eed50cf9adc31b00787056c5c4cdda914a5552..44af9f24b2984937fed4c549bd1b2d3a46bdefef 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_021.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_021.cpp @@ -32,10 +32,13 @@ static UINT32 Testcase(VOID) { + INT32 ret; CHAR mqname[MQUEUE_STANDARD_NAME_LENGTH] = ""; mqd_t mqueue; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq021_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, + "/mq021_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); mqueue = mq_open(mqname, O_RDWR, S_IRUSR | S_IWUSR, NULL); ICUNIT_GOTO_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT); @@ -45,6 +48,7 @@ static UINT32 Testcase(VOID) EXIT: mq_close(mqueue); mq_unlink(mqname); +EXIT1: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_025.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_025.cpp index 34df3292d0e90ea87582cc57452a03b5f26a450c..a822ce26655e8ecdc41425dc11e6b1947cc51629 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_025.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_025.cpp @@ -30,16 +30,23 @@ */ #include "It_posix_queue.h" +#define QUEUE_NAME_MAX_LEN (MQUEUE_NAME_MAX_TEST * 2) + static UINT32 Testcase(VOID) { - CHAR mqname[MQUEUE_NAME_MAX_TEST * 2]; + CHAR mqname[QUEUE_NAME_MAX_LEN]; mqd_t mqueue; + UINT32 ret; INT32 i; - snprintf(mqname, MQUEUE_NAME_MAX_TEST * 2, "/mq025_%d", LosCurTaskIDGet()); // 2, mqname length. + ret = snprintf_s(mqname, QUEUE_NAME_MAX_LEN, QUEUE_NAME_MAX_LEN - 1, \ + "/mq025_%d", LosCurTaskIDGet()); // 2, mqname length. + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); - for (i = 0; i < MQUEUE_NAME_MAX_TEST; i++) - strcat(mqname, "0"); + for (i = 0; i < MQUEUE_NAME_MAX_TEST; i++) { + ret = strcat_s(mqname, QUEUE_NAME_MAX_LEN, "0"); + ICUNIT_ASSERT_EQUAL(ret, EOK, ret); + } mqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, NULL); ICUNIT_GOTO_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT); @@ -49,6 +56,7 @@ static UINT32 Testcase(VOID) EXIT: mq_close(mqueue); mq_unlink(mqname); +EXIT1: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_026.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_026.cpp index 85a62c36e3cf4e66e600d869b8458f9344dd754d..b264118000ebffc0e1fb5055878a8e4a37b89de1 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_026.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_026.cpp @@ -32,10 +32,13 @@ static UINT32 Testcase(VOID) { + INT32 ret; CHAR qname[MQUEUE_STANDARD_NAME_LENGTH] = ""; mqd_t queue; - snprintf(qname, MQUEUE_STANDARD_NAME_LENGTH, "/mq026-1_%d", LosCurTaskIDGet()); + ret = snprintf_s(qname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq026-1_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); queue = mq_open(qname, O_RDWR, S_IRUSR | S_IWUSR, NULL); ICUNIT_GOTO_EQUAL(queue, (mqd_t)-1, queue, EXIT); @@ -45,6 +48,7 @@ static UINT32 Testcase(VOID) EXIT: mq_close(queue); mq_unlink(qname); +EXIT1: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_027.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_027.cpp index 7bf876e11e6d190a833d254d74d9f7feef82f45e..5c82bd5103998c2f4c7e087fb842cd18e5a35bfd 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_027.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_027.cpp @@ -36,7 +36,9 @@ static UINT32 Testcase(VOID) INT32 ret; mqd_t queue; - snprintf(qname, MQUEUE_STANDARD_NAME_LENGTH, "/mq027-1_%d", LosCurTaskIDGet()); + ret = snprintf_s(qname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq027-1_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); queue = mq_open(qname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, NULL); if (queue == (mqd_t)-1) { @@ -53,6 +55,7 @@ static UINT32 Testcase(VOID) EXIT: mq_close(queue); mq_unlink(qname); +EXIT1: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_031.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_031.cpp index 68263166c95262bde28b16c493d3aec1a14271a7..e0c890d15df0982b9c8bc8526738dd6af9cb8a28 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_031.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_031.cpp @@ -40,7 +40,9 @@ static UINT32 Testcase(VOID) mqd_t mqueue; struct mq_attr attr = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq031_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq031_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_SHORT_ARRAY_LENGTH; @@ -69,6 +71,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_032.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_032.cpp index 9feb13998772d5f665b5271fef179224e35ad1cb..ca6bae3757d060490029c86f146298eb06725964 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_032.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_032.cpp @@ -37,7 +37,9 @@ static UINT32 Testcase(VOID) mqd_t mqueue; struct sigevent se; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq032_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, + "/mq032_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, NULL); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); @@ -53,6 +55,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_033.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_033.cpp index 6c426821487c7c61c6f26c3d924023919bb1897e..b6ff4d5091c67051e6277634b1861eb75f4b5eb9 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_033.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_033.cpp @@ -39,7 +39,9 @@ static UINT32 Testcase(VOID) mqd_t mqueue; struct mq_attr attr = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq033_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq033_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_SHORT_ARRAY_LENGTH; @@ -66,6 +68,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_036.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_036.cpp index 991352a29337d161a9594320d624568dd4df16a9..20a8538b5c11ee9b021e6ffe81f1f58d90c85096 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_036.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_036.cpp @@ -38,7 +38,9 @@ static UINT32 Testcase(VOID) struct timespec ts; mqd_t mqueue; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq036_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq036_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, NULL); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); @@ -60,6 +62,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_038.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_038.cpp index 1a0eadb30ae398342b8b658250c28417a6be4017..bda8e365cab62f42a2a155b4018c1348996d880a 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_038.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_038.cpp @@ -37,8 +37,10 @@ static UINT32 Testcase(VOID) const CHAR *msgptr = MQUEUE_SEND_STRING_TEST; mqd_t mqueue; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq038_%d", LosCurTaskIDGet()); - + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq038_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); + mqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, NULL); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); @@ -57,6 +59,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_040.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_040.cpp index 4442ff61eb5d2ae40e78bda3b171475882e7d767..120c6094b8b0b35613eef9379e2b0e002e7c5276 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_040.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_040.cpp @@ -88,7 +88,9 @@ static UINT32 Testcase(VOID) struct mq_attr attr = { 0 }; pthread_attr_t attr1; - snprintf(g_gqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq040_%d", getpid()); + ret = snprintf_s(g_gqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq040_%d", getpid()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT3); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = 5; // 5, queue max message size. @@ -133,6 +135,7 @@ EXIT1: EXIT: mq_close(g_gqueue); mq_unlink(g_gqname); +EXIT3: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_041.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_041.cpp index 7acdcafac022036959ee6acfdc024eae4edae6d1..e710462bb7c0f38409ba4080e4809e6fb4970287 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_041.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_041.cpp @@ -91,7 +91,9 @@ static UINT32 Testcase(VOID) pthread_attr_t attr1; pthread_t newTh1, newTh2; - snprintf(g_gqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq041_%d", LosCurTaskIDGet()); + ret = snprintf_s(g_gqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq041_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT3); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = 5; // 5, queue max message size. @@ -135,6 +137,7 @@ EXIT1: EXIT: mq_close(g_gqueue); mq_unlink(g_gqname); +EXIT3: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_042.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_042.cpp index 926d6ce29ca2c7974f1cfb21d0a07a07968dde8b..5cea73876981dc78a2bae58c5676942da2cae259 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_042.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_042.cpp @@ -39,7 +39,9 @@ static UINT32 Testcase(VOID) mqd_t mqueue; struct mq_attr attr = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq042_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, + "/mq042_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_SHORT_ARRAY_LENGTH; @@ -48,7 +50,8 @@ static UINT32 Testcase(VOID) ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); while (1) { - snprintf(msgptr, MQUEUE_STANDARD_NAME_LENGTH, "message %d", i); + ret = snprintf_s(msgptr, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, "message %d", i); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); ret = mq_send(mqueue, msgptr, strlen(msgptr), 0); if (ret == -1) { ICUNIT_GOTO_EQUAL(errno, EAGAIN, errno, EXIT1); @@ -59,7 +62,8 @@ static UINT32 Testcase(VOID) ICUNIT_GOTO_EQUAL(i, MQUEUE_SHORT_ARRAY_LENGTH, i, EXIT1); i = 0; - snprintf(msgptr, MQUEUE_STANDARD_NAME_LENGTH, "message %d", i); + ret = snprintf_s(msgptr, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, "message %d", i); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); ret = mq_receive(mqueue, msgrcd, MQUEUE_STANDARD_NAME_LENGTH, NULL); ICUNIT_GOTO_EQUAL(ret, strlen(msgptr), ret, EXIT1); @@ -77,6 +81,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_043.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_043.cpp index 5b4e65d7187c775d7f4f74a577303931ed84217e..a4fa329c21358e9f746049fbf2a637641f96128b 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_043.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_043.cpp @@ -39,7 +39,9 @@ static UINT32 Testcase(VOID) mqd_t mqueue; struct mq_attr attr = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq043_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, + "/mq043_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_SHORT_ARRAY_LENGTH; @@ -67,6 +69,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_044.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_044.cpp index 801e114daa79203038c8c6b2c0279842f006be9a..b57ecaab65e6255a2970b143ade9565a571b1018 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_044.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_044.cpp @@ -39,7 +39,9 @@ static UINT32 Testcase(VOID) mqd_t mqueue; struct mq_attr attr = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq044_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, + "/mq044_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_SHORT_ARRAY_LENGTH; @@ -68,6 +70,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_046.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_046.cpp index 90aacd21e19eb2de7cec77ecbf5f8405aa609f84..6ffbfef13f49016a4d27e1894e54895591e39c6e 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_046.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_046.cpp @@ -37,7 +37,9 @@ static UINT32 Testcase(VOID) mqd_t queue; INT32 unresolved = 0, failure = 0, ret = 0; - snprintf(qname, MQUEUE_STANDARD_NAME_LENGTH, "/mq046-1_%d", LosCurTaskIDGet()); + ret = snprintf_s(qname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq046-1_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT); queue = mq_open(qname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, NULL); ICUNIT_GOTO_NOT_EQUAL(queue, (mqd_t)-1, queue, EXIT); diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_047.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_047.cpp index 97b1a704320283fdec7d5097cbfd62d4d8b2b8f1..5536fcbc91cfbfa5b6f81133e9d1819a3af0c653 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_047.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_047.cpp @@ -38,7 +38,9 @@ static UINT32 Testcase(VOID) const CHAR *msgptr = MQUEUE_SEND_STRING_TEST; mqd_t mqueue; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq047_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, + "/mq047_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_RDONLY | O_NONBLOCK, S_IRUSR | S_IWUSR, NULL); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); @@ -66,6 +68,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_048.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_048.cpp index 254437ee02793db46994d6d2218811f05dfa8be6..fbbd7eaef467222c4088abee07eba601435bf89d 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_048.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_048.cpp @@ -40,7 +40,9 @@ static UINT32 Testcase(VOID) struct timespec ts; struct mq_attr attr = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq048_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq048_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; @@ -67,6 +69,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_049.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_049.cpp index 061bd055a0d1e3679c12d7aa5b91d7f8e0837672..4f113bf40ddb434b4da5798cc3735fa103289d45 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_049.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_049.cpp @@ -38,7 +38,9 @@ static UINT32 Testcase(VOID) const CHAR *msgptr = MQUEUE_SEND_STRING_TEST; mqd_t mqueue; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq049_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq049_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, NULL); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); @@ -60,6 +62,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_050.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_050.cpp index 09c75e2d00ebbab5f5bae6804a59152337cea2b0..3563fa53f7346c378b06c3111c3b27658dfd9f2e 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_050.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_050.cpp @@ -40,8 +40,10 @@ static UINT32 Testcase(VOID) struct mq_attr attr = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq050_%d", LosCurTaskIDGet()); - + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, + "/mq050_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); + for (i = 0; i < MQUEUE_PRIORITY_NUM_TEST; i++) { attr.mq_msgsize = messagesize[i]; attr.mq_maxmsg = messagesize[i]; @@ -65,6 +67,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_052.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_052.cpp index 552963f088f1b8a3e7f1f2a5360318440bd5bcd5..cbcc4c40bc9a01c581c1da1f0e9393df78fb5fdb 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_052.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_052.cpp @@ -39,7 +39,9 @@ static UINT32 Testcase(VOID) mqd_t mqueue; struct mq_attr attr; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq052_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, + "/mq052_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH + 1; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH + 1; @@ -65,6 +67,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_054.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_054.cpp index 56d26440b97ecabf22d964cd037f03170b41b13e..e81bd409cce891ea60f0971081d42500beca8354 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_054.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_054.cpp @@ -38,7 +38,9 @@ static UINT32 Testcase(VOID) mqd_t mqueue; struct mq_attr attr = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq054_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq054_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; @@ -60,6 +62,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_055.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_055.cpp index 866fb2cf8962639d61545042b72ad6e0c4cfd995..e963e8bb1d24fe59bae927e1ff2adbd329c33f95 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_055.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_055.cpp @@ -41,7 +41,9 @@ static UINT32 Testcase(VOID) mqd_t mqueue; struct mq_attr attr = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq055_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq055_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; @@ -80,6 +82,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_056.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_056.cpp index 0d8eaf1d1b83c5c7750561b3685cc1ce7ecae51b..b1f0d42387f73a1bc2103395872ab521a0ab189e 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_056.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_056.cpp @@ -37,7 +37,9 @@ static UINT32 Testcase(VOID) struct mq_attr attr = { 0 }; INT32 unresolved = 0, failure = 0, ret = 0; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq056-1-%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq056-1-%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; @@ -63,6 +65,7 @@ static UINT32 Testcase(VOID) EXIT: mq_close(mqdes); mq_unlink(mqname); +EXIT1: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_057.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_057.cpp index 6e081c1e01c97b5a1fff47ee08a0a5c385d5fd42..d266c85733c02192b5025d5e3d64151cdc844add 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_057.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_057.cpp @@ -38,7 +38,9 @@ static UINT32 Testcase(VOID) CHAR msgrv[MQUEUE_STANDARD_NAME_LENGTH] = {0}; struct mq_attr attr = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq057_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq057_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; @@ -61,6 +63,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_058.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_058.cpp index cd0bb9ae5cfb65261a59aec1961f202ab8436560..2af7b114440b9f9eedf9cd62c73d3f97b5451518 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_058.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_058.cpp @@ -38,7 +38,9 @@ static UINT32 Testcase(VOID) struct mq_attr attr = { 0 }; INT32 unresolved = 0, failure = 0, ret = 0; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq058-2-%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq058-2-%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; @@ -59,6 +61,7 @@ static UINT32 Testcase(VOID) EXIT: mq_close(mqdes); mq_unlink(mqname); +EXIT1: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_060.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_060.cpp index d74b170210ca26d4f8a212d946457c30103e6e35..02ed05a6382bcbc3c7fc0b2c163220ee505ff289 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_060.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_060.cpp @@ -35,8 +35,10 @@ static UINT32 Testcase(VOID) INT32 ret; CHAR mqname[MQUEUE_STANDARD_NAME_LENGTH] = ""; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq060_%d", LosCurTaskIDGet()); - + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq060_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT); + ret = mq_unlink(mqname); ICUNIT_GOTO_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); ICUNIT_GOTO_EQUAL(errno, ENOENT, errno, EXIT); diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_061.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_061.cpp index 1fe6064ddd7a08910984e55f657d9687ecba6235..e41a41504f8fa017d880cf6a5d9d82458036c782 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_061.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_061.cpp @@ -38,12 +38,15 @@ static UINT32 Testcase(VOID) INT32 unresolved = 0; INT32 failure = 0, ret = 0; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq061-1_%d", LosCurTaskIDGet()); - + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq061-1_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); + mqdes = mq_open(mqname, O_CREAT | O_RDWR | O_NONBLOCK, S_IRUSR | S_IWUSR, NULL); ICUNIT_GOTO_NOT_EQUAL(mqdes, (mqd_t)-1, mqdes, EXIT); - memset(&mqstat, 0, sizeof(mqstat)); + ret = memset_s(&mqstat, sizeof(mqstat), 0, sizeof(mqstat)); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); ret = mq_getattr(mqdes, &mqstat); ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); @@ -63,6 +66,7 @@ static UINT32 Testcase(VOID) EXIT: mq_close(mqdes); mq_unlink(mqname); +EXIT1: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_063.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_063.cpp index 57f77d7b029f13c75bf5c1e6ee472587feb9625a..c734057b53e2570c023425ddc893c05951add577 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_063.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_063.cpp @@ -38,15 +38,19 @@ static UINT32 Testcase(VOID) INT32 unresolved = 0; INT32 failure = 0, ret = 0; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq063-1_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq063-1_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); - memset(&mqstat, 0, sizeof(mqstat)); + ret = memset_s(&mqstat, sizeof(mqstat), 0, sizeof(mqstat)); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); mqstat.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; mqstat.mq_maxmsg = 40; // 40, queue max message size. mqdes = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &mqstat); ICUNIT_GOTO_NOT_EQUAL(mqdes, (mqd_t)-1, mqdes, EXIT); - memset(&nmqstat, 0, sizeof(nmqstat)); + ret = memset_s(&nmqstat, sizeof(nmqstat), 0, sizeof(nmqstat)); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); ret = mq_getattr(mqdes, &nmqstat); ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); @@ -66,6 +70,7 @@ static UINT32 Testcase(VOID) EXIT: mq_close(mqdes); mq_unlink(mqname); +EXIT1: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_064.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_064.cpp index d0f6ca489e735a79b574eea0462fc9a69d0b2ae2..b602f4241e8861160efadba0b97cf965cf1797f4 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_064.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_064.cpp @@ -38,9 +38,12 @@ static UINT32 Testcase(VOID) mqd_t mqueue; struct mq_attr mqstat; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq064_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq064_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); - memset(&mqstat, 0, sizeof(mqstat)); + ret = memset_s(&mqstat, sizeof(mqstat), 0, sizeof(mqstat)); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); mqstat.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; mqstat.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; mqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &mqstat); @@ -50,7 +53,8 @@ static UINT32 Testcase(VOID) ret = mq_send(mqueue, msgptr, strlen(msgptr), 0); ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); } - memset(&mqstat, 0, sizeof(mqstat)); + ret = memset_s(&mqstat, sizeof(mqstat), 0, sizeof(mqstat)); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT1); ret = mq_getattr(mqueue, &mqstat); ICUNIT_GOTO_EQUAL(ret, MQUEUE_NO_ERROR, ret, EXIT1); ICUNIT_GOTO_EQUAL(mqstat.mq_curmsgs, 5, mqstat.mq_curmsgs, EXIT1); // 5, assert the curmsgs. @@ -66,6 +70,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_065.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_065.cpp index 4760d6cbe057334600663dbd1834ad12de491514..041a008a0e8b6ce26fce7645743ea2957aea6194 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_065.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_065.cpp @@ -37,13 +37,16 @@ static UINT32 Testcase(VOID) mqd_t mqueue, mqdesInvalid; struct mq_attr mqstat; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq065_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq065_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, 0); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); mqdesInvalid = (mqd_t)((UINTPTR)mqueue + PER_ADDED_VALUE); - memset(&mqstat, 0, sizeof(mqstat)); + ret = memset_s(&mqstat, sizeof(mqstat), 0, sizeof(mqstat)); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT1); ret = mq_getattr(mqdesInvalid, &mqstat); ICUNIT_GOTO_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); @@ -60,6 +63,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_066.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_066.cpp index 03b127e9812654be13bfdb0e01ed4c1ee01fcd8a..b3e63e774d6bd9ec85f04d2a618517c236cb3361 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_066.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_066.cpp @@ -39,13 +39,17 @@ static UINT32 Testcase(VOID) INT32 unresolved = 0; INT32 failure = 0, ret = 0; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq066-1_%d", LosCurTaskIDGet()); - + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq066-1_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); + mqdes = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, 0); ICUNIT_GOTO_NOT_EQUAL(mqdes, (mqd_t)-1, mqdes, EXIT); - memset(&mqstat, 0, sizeof(mqstat)); - memset(&nmqstat, 0, sizeof(nmqstat)); + ret = memset_s(&mqstat, sizeof(mqstat), 0, sizeof(mqstat)); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); + ret = memset_s(&nmqstat, sizeof(nmqstat), 0, sizeof(nmqstat)); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); ret = mq_getattr(mqdes, &mqstat); ICUNIT_GOTO_NOT_EQUAL(ret, -1, ret, EXIT); @@ -73,6 +77,7 @@ static UINT32 Testcase(VOID) EXIT: mq_close(mqdes); mq_unlink(mqname); +EXIT1: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_067.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_067.cpp index 637794b0ffa023428094a503052cdaf3bc6c9b86..3742e40f13fbaf5fa0a3744777ae8acf848370f6 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_067.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_067.cpp @@ -38,13 +38,17 @@ static UINT32 Testcase(VOID) struct mq_attr mqstat1 = { 0 }; struct mq_attr mqstat2 = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq067_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq067_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, 0); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); - memset(&mqstat1, 0, sizeof(mqstat1)); - memset(&mqstat2, 0, sizeof(mqstat1)); + ret = memset_s(&mqstat1, sizeof(mqstat1), 0, sizeof(mqstat1)); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); + ret = memset_s(&mqstat2, sizeof(mqstat2), 0, sizeof(mqstat1)); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); ret = mq_getattr(mqueue, &mqstat1); ICUNIT_GOTO_NOT_EQUAL(ret, -1, ret, EXIT1); @@ -73,6 +77,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_069.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_069.cpp index 57b2a789017220441602bd07b7bb1d852123c085..d10ec5890424b83aee2540b6881e3e7f4043aa83 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_069.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_069.cpp @@ -38,16 +38,20 @@ static UINT32 Testcase(VOID) struct mq_attr mqstat1; struct mq_attr mqstat2; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq069_%d", LosCurTaskIDGet()); - + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq069_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT3); + mqueue1 = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, 0); ICUNIT_GOTO_NOT_EQUAL(mqueue1, (mqd_t)-1, mqueue1, EXIT1); mqueue2 = mqueue1; mqueue1 = (mqd_t)((UINTPTR)mqueue1 + PER_ADDED_VALUE); - memset(&mqstat1, 0, sizeof(mqstat1)); - memset(&mqstat2, 0, sizeof(mqstat2)); + ret = memset_s(&mqstat1, sizeof(mqstat1), 0, sizeof(mqstat1)); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); + ret = memset_s(&mqstat2, sizeof(mqstat2), 0, sizeof(mqstat2)); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); mqstat2.mq_flags = 1; ret = mq_setattr(mqueue1, &mqstat1, NULL); @@ -73,6 +77,7 @@ EXIT1: mq_close(mqueue1); EXIT: mq_unlink(mqname); +EXIT3: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_070.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_070.cpp index 6b80f610344f1a49e8ef68d10dcdf812ea05c9b3..b1421a7e4856309f9508cba6d8a2b5a1eead3be4 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_070.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_070.cpp @@ -44,8 +44,10 @@ static UINT32 Testcase(VOID) attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq070_%d", LosCurTaskIDGet()); - + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq070_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); + mqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); @@ -85,6 +87,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_071.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_071.cpp index e2d4c17cb87a934207f6508e3335cb3eea3574dc..5a195c7ab8c1139ed3b2f40ebcb5262c21218c5f 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_071.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_071.cpp @@ -42,7 +42,9 @@ static UINT32 Testcase(VOID) attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq071_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq071_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); @@ -65,6 +67,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_072.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_072.cpp index 209f95c120012f0c33dfb3ae29fb4dc2ccb6e3ae..161ad55ebac19075e290965353f09c3e73a3cbda 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_072.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_072.cpp @@ -43,7 +43,9 @@ static UINT32 Testcase(VOID) msgAttr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; msgAttr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; - snprintf(qName, MQUEUE_STANDARD_NAME_LENGTH, "/mq072_%d", LosCurTaskIDGet()); + ret = snprintf_s(qName, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq072_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT); msgQId = mq_open(qName, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &msgAttr); ICUNIT_GOTO_NOT_EQUAL(msgQId, (mqd_t)-1, msgQId, EXIT); diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_073.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_073.cpp index 84da59ce35da0ed02c73c2a30597378c675833fa..0c90161bd0f65f7ca472957c9e74ecfa220e6b9f 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_073.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_073.cpp @@ -43,9 +43,13 @@ static UINT32 Testcase(VOID) attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; - snprintf(mqname1, MQUEUE_STANDARD_NAME_LENGTH, "/mq073_1_%d", LosCurTaskIDGet()); - snprintf(mqname2, MQUEUE_STANDARD_NAME_LENGTH, "/mq073_2_%d", LosCurTaskIDGet()); - + ret = snprintf_s(mqname1, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq073_1_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); + ret = snprintf_s(mqname2, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq073_2_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); + mqueue1 = mq_open(mqname1, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(mqueue1, (mqd_t)-1, mqueue1, EXIT); @@ -77,6 +81,7 @@ EXIT1: EXIT: mq_close(mqueue1); mq_unlink(mqname1); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_075.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_075.cpp index 2fea2090305a917e6261755a9603579cb8bef332..949850915efa1339eb5dc0b6bca5850215087482 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_075.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_075.cpp @@ -65,8 +65,9 @@ static UINT32 Testcase(VOID) g_testFlag = 1; // 1 initialize the flag LOS_TaskLock(); - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq075_%d", LosCurTaskIDGet()); - + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq075_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); g_gqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(g_gqueue, (mqd_t)-1, g_gqueue, EXIT1); ret = pthread_attr_init(&attr1); @@ -110,6 +111,7 @@ EXIT1: mq_unlink(mqname); EXIT: PosixPthreadDestroy(&attr1, pthread1); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_076.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_076.cpp index f34f5c23a729c1b229c71c9722c04ff428c64782..aab026ac2d2bc51d1ab4eb99443ef7a615964aa2 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_076.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_076.cpp @@ -63,7 +63,9 @@ static VOID *PthreadF02(VOID *arg) attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = 2; // 2, queue max message size. - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq076_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq076_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); g_gqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(g_gqueue, (mqd_t)-1, g_gqueue, EXIT1); @@ -103,6 +105,7 @@ EXIT1: EXIT: PosixPthreadDestroy(&attr1, thread1); g_testCount = 0; +EXIT2: return NULL; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_077.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_077.cpp index d3f4be8e7225a83c42e9ff73b489d64c3b575773..8721c8c792e2ec2688bd9c0558e89413f110cf47 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_077.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_077.cpp @@ -64,8 +64,9 @@ static UINT32 Testcase(VOID) g_testCount = 0; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq077_%d", LosCurTaskIDGet()); - + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq077_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); g_gqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(g_gqueue, (mqd_t)-1, g_gqueue, EXIT1); @@ -104,6 +105,7 @@ EXIT1: EXIT: mq_close(g_gqueue); mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_078.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_078.cpp index 8ee1ff07d5a1889c0147e5cbe7c81221b078a728..1c9860d4432737116d8820ee800dc6fd889f2ee0 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_078.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_078.cpp @@ -65,7 +65,9 @@ static UINT32 Testcase(VOID) g_testCount = 0; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq078_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq078_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); g_gqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_ASSERT_NOT_EQUAL(g_gqueue, (mqd_t)-1, g_gqueue); @@ -107,6 +109,7 @@ EXIT1: EXIT: mq_close(g_gqueue); mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_079.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_079.cpp index 0599283bcbbaa70249158351cf849f4771b98399..b657845e64929d00af624aaf7d7c04dbd26a01fd 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_079.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_079.cpp @@ -91,8 +91,10 @@ static UINT32 Testcase(VOID) pthread_attr_t attr1; struct sched_param schedparam; - memset(g_gqname, 0, MQUEUE_STANDARD_NAME_LENGTH); - snprintf(g_gqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq079_%d", LosCurTaskIDGet()); + ret = memset_s(g_gqname, MQUEUE_STANDARD_NAME_LENGTH, 0, MQUEUE_STANDARD_NAME_LENGTH); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); + (void)snprintf_s(g_gqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq079_%d", LosCurTaskIDGet()); g_testCount = 0; diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_080.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_080.cpp index 74e7251568a840b0fa251570d2f98a8997487891..c68b06e3d057ff41505a3e4df8feae4b3df084eb 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_080.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_080.cpp @@ -40,8 +40,10 @@ static UINT32 Testcase(VOID) INT32 unresolved = 0, failure = 0, i, maxreached = 0, ret = 0; unsigned pri; - snprintf(qname, MQUEUE_STANDARD_NAME_LENGTH, "/mq080-1_%d", LosCurTaskIDGet()); - + ret = snprintf_s(qname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq080-1_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); + attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MAXMSG5; queue = mq_open(qname, O_CREAT | O_RDWR | O_NONBLOCK, S_IRUSR | S_IWUSR, &attr); @@ -50,7 +52,8 @@ static UINT32 Testcase(VOID) ts.tv_sec = 0; ts.tv_nsec = 0; for (i = 0; i < MAXMSG5 + 1; i++) { - snprintf(msgptr, MQUEUE_STANDARD_NAME_LENGTH, "message %d", i); + ret = snprintf_s(msgptr, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, "message %d", i); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT); ts.tv_sec++; if (mq_timedsend(queue, msgptr, strlen(msgptr), 0, &ts) == -1) { maxreached = 1; @@ -77,6 +80,7 @@ static UINT32 Testcase(VOID) EXIT: mq_close(queue); mq_unlink(qname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_081.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_081.cpp index 3ac51ae4fa18746ebca6d5a035d42854bf7c319c..9af005ad0583ba6629459892343d38b0aeee8e28 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_081.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_081.cpp @@ -40,7 +40,9 @@ static UINT32 Testcase(VOID) INT32 unresolved = 0, ret; unsigned pri; - snprintf(qname, MQUEUE_STANDARD_NAME_LENGTH, "/mq081-1_%d", LosCurTaskIDGet()); + ret = snprintf_s(qname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq081-1_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MAXMSG5; @@ -68,6 +70,7 @@ static UINT32 Testcase(VOID) EXIT: mq_close(queue); mq_unlink(qname); +EXIT1: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_082.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_082.cpp index ee23a2bcfe880259e2faa94aea8582d0ea708434..d39bd4b99f1248cd61501fabc533e31a2868b832 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_082.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_082.cpp @@ -40,7 +40,9 @@ static UINT32 Testcase(VOID) mqd_t mqueue; struct mq_attr attr = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq082_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq082_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; @@ -67,6 +69,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_083.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_083.cpp index 55b26c13f79125308c5ee008c1cd6745e5279d16..bdb9305e9539d9555f5da85d4c6f6f86048f78e7 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_083.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_083.cpp @@ -39,8 +39,9 @@ static UINT32 Testcase(VOID) mqd_t queue; INT32 unresolved = 0, failure = 0, i, maxreached = 0, ret = 0; - snprintf(qname, MQUEUE_STANDARD_NAME_LENGTH, "/mq083-1_%d", LosCurTaskIDGet()); - + ret = snprintf_s(qname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq083-1_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); attr.mq_msgsize = 100; // 100, queue message size. attr.mq_maxmsg = MAXMSG5; queue = mq_open(qname, O_CREAT | O_RDWR | O_NONBLOCK, S_IRUSR | S_IWUSR, &attr); @@ -49,12 +50,14 @@ static UINT32 Testcase(VOID) ts.tv_sec = 1; ts.tv_nsec = 0; for (i = 0; i < MAXMSG5; i++) { - snprintf(msgptr, MQUEUE_STANDARD_NAME_LENGTH, "message %d", i); + ret = snprintf_s(msgptr, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, "message %d", i); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT); ret = mq_timedsend(queue, msgptr, strlen(msgptr), 0, &ts); ICUNIT_GOTO_NOT_EQUAL(ret, -1, ret, EXIT); } - snprintf(msgptr, MQUEUE_STANDARD_NAME_LENGTH, "message %d", i); + ret = snprintf_s(msgptr, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, "message %d", i); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); ret = mq_timedsend(queue, msgptr, strlen(msgptr), 0, &ts); ICUNIT_GOTO_EQUAL(ret, -1, ret, EXIT); ICUNIT_GOTO_EQUAL(errno, EAGAIN, errno, EXIT); @@ -69,6 +72,7 @@ static UINT32 Testcase(VOID) EXIT: mq_close(queue); mq_unlink(qname); +EXIT1: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_084.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_084.cpp index 02b6fc18cbe2addf73a54c2afce134755d2908e8..07410d79088d4ea4369baacb6bb3439fb4bf727d 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_084.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_084.cpp @@ -38,8 +38,9 @@ static UINT32 Testcase(VOID) mqd_t queue; INT32 unresolved = 0, failure = 0, ret = 0; - snprintf(qname, MQUEUE_STANDARD_NAME_LENGTH, "/mq084-1_%d", LosCurTaskIDGet()); - + ret = snprintf_s(qname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq084-1_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); queue = mq_open(qname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, NULL); ICUNIT_GOTO_NOT_EQUAL(queue, (mqd_t)-1, queue, EXIT); @@ -59,6 +60,7 @@ static UINT32 Testcase(VOID) EXIT: mq_close(queue); mq_unlink(qname); +EXIT1: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_085.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_085.cpp index 750ee14b6e264f6aee6fa86e6c76dbde28ee701b..9017ad4cf8f053e4dd25d512a68432ddfe1aa999 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_085.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_085.cpp @@ -38,8 +38,9 @@ static UINT32 Testcase(VOID) struct timespec ts; mqd_t mqueue; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq085_%d", LosCurTaskIDGet()); - + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq085_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_RDONLY, S_IRUSR | S_IWUSR, NULL); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); @@ -60,6 +61,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_086.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_086.cpp index 6771dbaf62d5aee69c3b05b350c39483864c64de..61c5cc1d2ff20e6b021352ffa76e430097d493dc 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_086.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_086.cpp @@ -38,7 +38,9 @@ static UINT32 Testcase(VOID) struct timespec ts; mqd_t mqueue; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "mq086_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "mq086_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, NULL); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); @@ -59,6 +61,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_087.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_087.cpp index 92ab2b4c1f9f3deb62ff357ad04515486e908513..09b44a7fbb3fe5105cd181243896ec7f41b2f73a 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_087.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_087.cpp @@ -39,8 +39,9 @@ static UINT32 Testcase(VOID) struct timespec ts; mqd_t mqueue; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq087_%d", LosCurTaskIDGet()); - + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq087_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, NULL); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); @@ -63,6 +64,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_088.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_088.cpp index b6c4caf800cac58d0663fddb3b9680e4a0cb6774..4f83427bb7b1e4d367ee4cd7b22657b8c612e676 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_088.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_088.cpp @@ -40,8 +40,9 @@ static UINT32 Testcase(VOID) mqd_t mqueue; struct mq_attr attr = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq088_%d", LosCurTaskIDGet()); - + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq088_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); ts.tv_sec = 0; ts.tv_nsec = 0; for (i = 0; i < MQUEUE_PRIORITY_NUM_TEST; i++) { @@ -68,6 +69,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_089.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_089.cpp index 5da1abcf2d50814a695f300e362bc502c76c816a..e2ddaa923503a2d5168bf67177b7d765147133f9 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_089.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_089.cpp @@ -38,8 +38,9 @@ static UINT32 Testcase(VOID) struct timespec ts; mqd_t mqueue; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/tm/mq089_%d", LosCurTaskIDGet()); - + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/tm/mq089_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, NULL); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); @@ -59,6 +60,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_090.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_090.cpp index 028c9a310a27faf152eaf97f29f1e40b6690ad8d..6cdb9b2e6b71c35bc2a84b5cd562e222f18a2bdb 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_090.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_090.cpp @@ -37,7 +37,8 @@ static UINT32 Testcase(VOID) INT32 i, unresolved = 0, failure = 0, numqueues = 0, ret; for (i = 0; (i < _POSIX_OPEN_MAX) && (i < _POSIX_MQ_OPEN_MAX); i++, numqueues++) { - snprintf(qname, MQUEUE_STANDARD_NAME_LENGTH, "/mq090%d_%d", i, LosCurTaskIDGet()); + (void)snprintf_s(qname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq090%d_%d", i, LosCurTaskIDGet()); queue[i] = mq_open(qname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, NULL); if (queue[i] == (mqd_t)-1) { @@ -59,12 +60,14 @@ static UINT32 Testcase(VOID) ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); } for (i = 0; i < numqueues; i++) { - snprintf(qname, MQUEUE_STANDARD_NAME_LENGTH, "/mq090%d_%d", i, LosCurTaskIDGet()); + (void)snprintf_s(qname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq090%d_%d", i, LosCurTaskIDGet()); ret = mq_unlink(qname); ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); } - snprintf(qname, MQUEUE_STANDARD_NAME_LENGTH, "/mq090%d_%d", numqueues, LosCurTaskIDGet()); + (void)snprintf_s(qname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq090%d_%d", numqueues, LosCurTaskIDGet()); ret = mq_unlink(qname); ICUNIT_GOTO_EQUAL(ret, -1, ret, EXIT); diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_091.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_091.cpp index 614e9c9daabefe2500a35bede01cd492daf4a9a7..a1303c79f5ad5d65faadb89877bc003ffcc2e2ae 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_091.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_091.cpp @@ -38,8 +38,9 @@ static UINT32 Testcase(VOID) struct timespec ts; mqd_t mqueue; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq091_%d", LosCurTaskIDGet()); - + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq091_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, NULL); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); @@ -60,6 +61,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_093.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_093.cpp index 4e8596f40a079633244fa95b7636fb906147b85d..a94324c8590783f676b2e0f8027c4708287a39a1 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_093.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_093.cpp @@ -40,8 +40,9 @@ static UINT32 Testcase(VOID) struct sigaction act; time_t currsec; - snprintf(g_gqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq093_%d", LosCurTaskIDGet()); - + ret = snprintf_s(g_gqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq093_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); attr.mq_maxmsg = MQUEUE_SHORT_ARRAY_LENGTH; attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; @@ -71,6 +72,7 @@ EXIT1: mq_close(g_gqueue); EXIT: mq_unlink(g_gqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_094.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_094.cpp index b9a9a0bf0a6cd375a8979ad388f1781c72366465..817cebf42810b42d6be7685f1aa68973c2bdd190 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_094.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_094.cpp @@ -38,8 +38,10 @@ static UINT32 Testcase(VOID) struct timespec ts; mqd_t mqueue; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq094_%d", LosCurTaskIDGet()); - + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq094_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); + mqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, NULL); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT); @@ -61,6 +63,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_095.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_095.cpp index 61c5d9ffc5212476bf04f88a37cfc62b55487b33..992e376f3bd13d806ceddd69bc007decb499670c 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_095.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_095.cpp @@ -42,7 +42,9 @@ static UINT32 Testcase(VOID) struct timespec ts; struct mq_attr attr = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq095_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq095_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; @@ -83,6 +85,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_096.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_096.cpp index 5556a8e14db46a9066b828944ec3cf15e862664b..1a75d55477bde53fd1ab591672808ef5934c0ea6 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_096.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_096.cpp @@ -40,9 +40,12 @@ static UINT32 Testcase(VOID) struct mq_attr attr; struct timespec ts; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq096_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq096_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); - memset(&attr, 0, sizeof(attr)); + ret = memset_s(&attr, sizeof(attr), 0, sizeof(attr)); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); attr.mq_msgsize = 20 + 1; // 20, queue message size. attr.mq_maxmsg = 20 + 1; // 20, queue max message size. @@ -69,6 +72,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_097.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_097.cpp index 00fad7b1b9619fd5b5e3253b5ede3ae792a6094c..09e7effd0664ce2cf4edf267f96f2994d51d2e89 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_097.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_097.cpp @@ -92,7 +92,9 @@ static UINT32 Testcase(VOID) pthread_attr_t attr1; pthread_t newTh, newTh2; - snprintf(g_gqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq097_%d", LosCurTaskIDGet()); + ret = snprintf_s(g_gqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq097_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT3); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; @@ -133,6 +135,7 @@ EXIT1: EXIT: mq_close(g_gqueue); mq_unlink(g_gqname); +EXIT3: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_098.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_098.cpp index 8071f727ed01af4ce22595effde1fe262b51f8ea..3a3fe30d59aa91351c27b378b0193f5f8a2ce33d 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_098.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_098.cpp @@ -36,7 +36,9 @@ static UINT32 Testcase(VOID) INT32 ret = 0; mqd_t queue; - snprintf(qname, MQUEUE_STANDARD_NAME_LENGTH, "/mq098_%d", LosCurTaskIDGet()); + ret = snprintf_s(qname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq098_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); queue = mq_open(qname, O_CREAT | O_RDWR | O_WRONLY, S_IRUSR | S_IWUSR, NULL); ICUNIT_GOTO_NOT_EQUAL(queue, (mqd_t)-1, queue, EXIT); @@ -51,6 +53,7 @@ static UINT32 Testcase(VOID) EXIT: mq_close(queue); mq_unlink(qname); +EXIT1: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_100.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_100.cpp index 954d2787108c6fe5c73ff1ed63e6b298f4220e2e..02637c8285e65a8f16b176178d040874540204ef 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_100.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_100.cpp @@ -39,7 +39,9 @@ static UINT32 Testcase(VOID) struct timespec ts; struct mq_attr attr = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq100_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq100_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; @@ -64,6 +66,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_101.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_101.cpp index aee4950a0a65e6095ddd83b9555c2bbf0884ac26..ef149c08212a9cf6a9760763c26c91370c7d976e 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_101.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_101.cpp @@ -42,7 +42,9 @@ static UINT32 Testcase(VOID) attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq101_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq101_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_RDWR | O_NONBLOCK, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); @@ -73,6 +75,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_102.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_102.cpp index b5e93be3d68aaafe2fd7e3ae726c65c38ceffa3b..6fe9769eaf925724af58a648b25236990298d1f5 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_102.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_102.cpp @@ -40,7 +40,9 @@ static UINT32 Testcase(VOID) struct timespec ts; struct mq_attr attr = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq102_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq102_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; @@ -68,6 +70,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_103.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_103.cpp index e235b46b6a3f33c16f3b3ad11b4006c9e0a663df..20891887a18dcada300277e9dba79e95bdae2860 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_103.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_103.cpp @@ -40,7 +40,9 @@ static UINT32 Testcase(VOID) struct timespec ts; struct mq_attr attr = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq103_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq103_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; @@ -68,6 +70,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_104.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_104.cpp index 14c49acf25cc4b4a39af4bd31cdc1b6fcbedc7c3..109b9257ce7f60d4867f4c90a8b99f940bd75ecf 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_104.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_104.cpp @@ -42,7 +42,9 @@ static UINT32 Testcase(VOID) struct timespec ts; struct mq_attr attr = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq104_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq104_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; @@ -83,6 +85,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_106.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_106.cpp index 0470c8b8bb48503e55c7049dd91c670c89376b8f..fa6b9de863bf3cff72503f233656f356385b1e62 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_106.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_106.cpp @@ -39,7 +39,9 @@ static UINT32 Testcase(VOID) struct timespec ts; struct mq_attr attr = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq106_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq106_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; @@ -64,6 +66,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_108.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_108.cpp index 898c252c144c46ee5bf6d671072a910d0a62603c..5c0afa2ca776e8d88bd8704abd2b589f639f2193 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_108.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_108.cpp @@ -38,7 +38,9 @@ static UINT32 Testcase(VOID) struct mq_attr attr = { 0 }; INT32 unresolved = 0, failure = 0, ret = 0; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq108-1_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq108-1_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; @@ -61,6 +63,7 @@ static UINT32 Testcase(VOID) EXIT: mq_close(mqdes); mq_unlink(mqname); +EXIT1: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_109.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_109.cpp index 558d7cc565fb70619662e1fa2d87154b974942cc..91c160f08f0f7b146a64ca14c6814be579e20139 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_109.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_109.cpp @@ -39,7 +39,9 @@ static UINT32 Testcase(VOID) struct timespec ts; struct mq_attr attr = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq109_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq109_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; @@ -63,6 +65,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_110.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_110.cpp index 1cac5c01b243b07246ebfed10423de4a8611c0f7..f107efe99ab9501a95a4f5b358d4d42f2d3305ca 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_110.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_110.cpp @@ -39,7 +39,9 @@ static UINT32 Testcase(VOID) struct timespec ts; struct mq_attr attr = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq110_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq110_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; @@ -63,6 +65,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_111.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_111.cpp index fdd8ff0034d28cf53e34d345b67baa3b619796f7..2e13de2b1f990f6e3d4d744d458ec2a50dc1e877 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_111.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_111.cpp @@ -59,7 +59,9 @@ static VOID *PthreadF02(VOID *arg) attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq111_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq111_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT3); g_gqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(g_gqueue, (mqd_t)-1, g_gqueue, EXIT2); @@ -95,6 +97,7 @@ EXIT1: mq_unlink(mqname); EXIT: pthread_join(pthread1, NULL); +EXIT3: return NULL; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_112.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_112.cpp index 40fcdb8b10c9c75030a6d8e3d862412d285170f7..0c2af96ab0c8325518bfed802efe1f715091a071 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_112.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_112.cpp @@ -61,7 +61,9 @@ static UINT32 Testcase(VOID) g_testCount = 0; - snprintf(qName, MQUEUE_STANDARD_NAME_LENGTH, "/mq112_%d", LosCurTaskIDGet()); + ret = snprintf_s(qName, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq112_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT); g_messageQId = mq_open(qName, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &msgAttr); ICUNIT_GOTO_NOT_EQUAL(g_messageQId, (mqd_t)-1, g_messageQId, EXIT); diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_113.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_113.cpp index 8a041343cd883e24e56308d2aa1cfacd9f368be9..b133bdad229bdeddab858718fd32659c9d4389c2 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_113.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_113.cpp @@ -66,7 +66,9 @@ static UINT32 Testcase(VOID) g_testCount = 0; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq113_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq113_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT3); g_gqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(g_gqueue, (mqd_t)-1, g_gqueue, EXIT2); @@ -115,6 +117,7 @@ EXIT1: pthread_join(pthread1, NULL); EXIT: pthread_attr_destroy(&attr1); +EXIT3: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_114.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_114.cpp index 01ff7d7a57f478c0abb01dd6ba5bacdbdf4447f8..cf3c050b74fa6e74f724b18c0cdfcfdac05f2f4c 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_114.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_114.cpp @@ -65,7 +65,9 @@ static UINT32 Testcase(VOID) g_testCount = 0; LOS_TaskLock(); - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq114_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq114_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT3); g_gqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(g_gqueue, (mqd_t)-1, g_gqueue, EXIT2); @@ -114,6 +116,7 @@ EXIT1: pthread_join(pthread1, NULL); EXIT: pthread_attr_destroy(&attr1); +EXIT3: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_115.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_115.cpp index 8ce095ba99ff9852615b1d02f9fb28923c4d5617..eedbc942001228748519295939765c4e02508564 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_115.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_115.cpp @@ -67,7 +67,9 @@ static UINT32 Testcase(VOID) LOS_TaskLock(); - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq115_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq115_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT3); g_gqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(g_gqueue, (mqd_t)-1, g_gqueue, EXIT2); @@ -113,6 +115,7 @@ EXIT1: pthread_join(pthread1, NULL); EXIT: pthread_attr_destroy(&attr1); +EXIT3: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_116.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_116.cpp index d4b3c190e9a7edaac62120708e6cab2fce7a0039..9e0fa7e21930d965dd5ee10be5bc8f178be533a6 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_116.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_116.cpp @@ -43,7 +43,9 @@ static VOID *PthreadF01(VOID *arg) LOS_AtomicInc(&g_testCount); - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq116_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq116_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); g_gqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(g_gqueue, (mqd_t)-1, g_gqueue, EXIT1); @@ -67,6 +69,7 @@ EXIT1: EXIT: mq_unlink(mqname); g_testCount = 0; +EXIT2: return NULL; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_117.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_117.cpp index d063374b435de40fe927e4ce0aab3808fb8a4c37..c1dbcfdbaacd437ebba035173343018e4da0ebe6 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_117.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_117.cpp @@ -63,7 +63,9 @@ static UINT32 Testcase(VOID) g_testCount = 0; LOS_TaskLock(); - snprintf(qName, MQUEUE_STANDARD_NAME_LENGTH, "/mq117_%d", LosCurTaskIDGet()); + ret = snprintf_s(qName, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq117_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT); g_messageQId = mq_open(qName, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &msgAttr); ICUNIT_GOTO_NOT_EQUAL(g_messageQId, (mqd_t)-1, g_messageQId, EXIT2); diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_118.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_118.cpp index f330480bcb2aa388f969b0eebb16060ac8742a06..91af0c1a2ba93848e3511a5807b8fb2c9fd0f4f0 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_118.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_118.cpp @@ -99,7 +99,8 @@ static UINT32 Testcase(VOID) LOS_TaskLock(); - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq118_%d", LosCurTaskIDGet()); + (void)snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, + "/mq118_%d", LosCurTaskIDGet()); g_gqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(g_gqueue, (mqd_t)-1, g_gqueue, EXIT); diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_119.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_119.cpp index d93f11d724bd35df84a00ef9f1a6ee0c6cee9f92..9e23add7ab77511fa70610ec6e0261a643e6bc58 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_119.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_119.cpp @@ -77,7 +77,9 @@ static VOID *PthreadF02(VOID *arg) LOS_AtomicInc(&g_testCount); - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq119_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq119_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT3); g_gqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(g_gqueue, (mqd_t)-1, g_gqueue, EXIT); @@ -117,6 +119,7 @@ EXIT1: EXIT: mq_close(g_gqueue); mq_unlink(mqname); +EXIT3: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_120.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_120.cpp index 3205a0dee41f3a844b67a701d33835e6b2e36f00..1def3053dc4519a326e9437f7abdbf8e90355e1b 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_120.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_120.cpp @@ -89,7 +89,8 @@ static UINT32 Testcase(VOID) g_testCount = 0; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq120_%d", LosCurTaskIDGet()); + (void)snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, + "/mq120_%d", LosCurTaskIDGet()); g_gqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(g_gqueue, (mqd_t)-1, g_gqueue, EXIT1); diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_121.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_121.cpp index 66574cce6806b5c061f0ab18d0f1ddea4c9897c2..0f40cff861329b3a32732abc5f789d419f852854 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_121.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_121.cpp @@ -141,7 +141,8 @@ static UINT32 Testcase(VOID) g_testCount = 0; - snprintf(qName, MQUEUE_STANDARD_NAME_LENGTH, "/mq121_%d", LosCurTaskIDGet()); + (void)snprintf_s(qName, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq121_%d", LosCurTaskIDGet()); g_messageQId = mq_open(qName, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &msgAttr); ICUNIT_GOTO_NOT_EQUAL(g_messageQId, (mqd_t)-1, g_messageQId, EXIT); diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_122.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_122.cpp index 60a483c6c15c7e417d67c2f02bdd1f9a27f8aa43..de3753fc2cffd5435cea4823db5a775674629387 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_122.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_122.cpp @@ -68,7 +68,9 @@ static UINT32 Testcase(VOID) g_testCount = 0; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq122_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq122_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT3); g_gqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(g_gqueue, (mqd_t)-1, g_gqueue, EXIT1); @@ -101,6 +103,7 @@ EXIT1: mq_close(g_gqueue); EXIT: mq_unlink(mqname); +EXIT3: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_123.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_123.cpp index c184793553fee377d4efab6aac658387ff6fdd12..7d34a05f10bb979ba050c9ce8e54decf3a40feaa 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_123.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_123.cpp @@ -47,7 +47,9 @@ static VOID HwiF01(VOID *arg) LOS_AtomicInc(&g_testCount); - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq123_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq123_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); g_gqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(g_gqueue, (mqd_t)-1, g_gqueue, EXIT); @@ -69,6 +71,7 @@ EXIT: mq_close(g_gqueue); mq_unlink(mqname); g_testCount = 0; +EXIT1: return; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_124.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_124.cpp index 774c8dd1e73f3cd30b3ee17206db2a42ec0cbd99..3cf6adaf14e5918fc3f82d9f101aa807fabaa321 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_124.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_124.cpp @@ -98,10 +98,13 @@ EXIT: static UINT32 Testcase(VOID) { UINT32 uret; + INT32 ret; g_testCount = 0; - snprintf(g_gqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq124_%d", LosCurTaskIDGet()); + ret = snprintf_s(g_gqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq124_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT); uret = LOS_HwiCreate(HWI_NUM_TEST1, 1, 0, (HWI_PROC_FUNC)HwiF02, 0); ICUNIT_GOTO_EQUAL(uret, MQUEUE_NO_ERROR, uret, EXIT); diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_125.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_125.cpp index f6372190730ef0adac88a8ae68af61585b770a21..60f323a3d0efeff5796ed14fa98fd80fa648e1a2 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_125.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_125.cpp @@ -103,7 +103,9 @@ static UINT32 Testcase(VOID) g_testCount = 0; - snprintf(g_gqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq125_%d", LosCurTaskIDGet()); + ret = snprintf_s(g_gqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq125_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT3); ret = pthread_attr_init(&attr1); ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); @@ -145,6 +147,7 @@ EXIT1: pthread_join(pthread1, NULL); EXIT: pthread_attr_destroy(&attr1); +EXIT3: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_126.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_126.cpp index 022b0001ae0cafa366d921b186086ef3c89c4a89..ac45f4a9678231116e85c013aab3f3984bbe9f24 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_126.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_126.cpp @@ -100,7 +100,9 @@ static UINT32 Testcase(VOID) g_testCount = 0; - snprintf(g_gqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq126_%d", LosCurTaskIDGet()); + ret = snprintf_s(g_gqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq126_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT3); uret = LOS_HwiCreate(HWI_NUM_TEST, 0, 0, (HWI_PROC_FUNC)HwiF01, 0); ICUNIT_GOTO_EQUAL(uret, MQUEUE_NO_ERROR, uret, EXIT); @@ -142,6 +144,7 @@ EXIT1: pthread_attr_destroy(&attr1); EXIT: TEST_HwiDelete(HWI_NUM_TEST); +EXIT3: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_128.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_128.cpp index b2060b62496a7f4d58c5dc5e65d5c2d73c7a389c..b05e6aa59d51b328141f83c32f1bb416e49aca92 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_128.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_128.cpp @@ -37,7 +37,9 @@ static UINT32 Testcase(VOID) mqd_t mqueue; struct mq_attr attr = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq128_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq128_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; @@ -60,6 +62,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_129.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_129.cpp index b78aa4fbb1aaf16f8f3514e9f9cd184690a577b9..ff8dd62206cbe3d5bddd162716619066abd45118 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_129.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_129.cpp @@ -42,7 +42,9 @@ static UINT32 Testcase(VOID) attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_SHORT_ARRAY_LENGTH; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq129_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq129_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); @@ -68,6 +70,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_130.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_130.cpp index 8ee6607c61a2cc42fdf642c4ff532bff66f98235..d4cfa92bf8152d3e4263e8ad0b5b35bad7a728bb 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_130.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_130.cpp @@ -41,7 +41,9 @@ static UINT32 Testcase(VOID) attr.mq_msgsize = 0; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq130_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq130_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); g_gqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_EQUAL(g_gqueue, (mqd_t)-1, g_gqueue, EXIT); @@ -58,6 +60,7 @@ static UINT32 Testcase(VOID) EXIT: mq_close(g_gqueue); mq_unlink(mqname); +EXIT1: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_133.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_133.cpp index f980ccf72dae1753314837393388f3b78e96a80c..a47adcbcb44a75ce74c2af0717f21c2ee61b559d 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_133.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_133.cpp @@ -88,7 +88,8 @@ static UINT32 Testcase(VOID) g_testCount = 0; - snprintf(qName, MQUEUE_STANDARD_NAME_LENGTH, "/mq170_%d", LosCurTaskIDGet()); + (void)snprintf_s(qName, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq170_%d", LosCurTaskIDGet()); g_messageQId = mq_open(qName, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &msgAttr); ICUNIT_GOTO_NOT_EQUAL(g_messageQId, (mqd_t)-1, g_messageQId, EXIT1); @@ -148,7 +149,6 @@ EXIT2: EXIT1: mq_close(g_messageQId); mq_unlink(qName); -EXIT: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_134.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_134.cpp index 1293dce174ec730844da394072e01631154c73c1..27f5a0410f8c5ecaa46ed87ad50a30e5241d7a38 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_134.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_134.cpp @@ -37,7 +37,9 @@ static UINT32 Testcase(VOID) CHAR mqname[MQUEUE_STANDARD_NAME_LENGTH] = ""; mqd_t mqueue; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq134_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq134_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, 0); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); @@ -55,6 +57,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_136.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_136.cpp index 83f0f82f7d55c058a38d024e70bf48e6bd69a247..71df4fcd199cde31746bb9a6fa56270cf89e00f7 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_136.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_136.cpp @@ -46,7 +46,8 @@ static UINT32 Testcase(VOID) msgAttr.mq_maxmsg = 20; // 20, mqueue message size. for (index = 0; index < (LOSCFG_BASE_IPC_QUEUE_CONFIG - QUEUE_EXISTED_NUM); index++) { - snprintf(qName[index], MQUEUE_STANDARD_NAME_LENGTH, "/mq136_%d", index); + (void)snprintf_s(qName[index], MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq136_%d", index); queueID[index] = mq_open(qName[index], O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &msgAttr); ICUNIT_GOTO_NOT_EQUAL(queueID[index], (mqd_t)-1, queueID[index], EXIT); } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_143.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_143.cpp index 246d34cb27c9ca541b0927055f70d485ba5a91a5..c43017527d165427244f5f1a4e1bc75932cd2a28 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_143.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_143.cpp @@ -61,7 +61,9 @@ static UINT32 Testcase(VOID) attr.mq_maxmsg = size; attr.mq_flags = O_NONBLOCK; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq143_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq143_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); g_gqueue = mq_open(mqname, O_CREAT | O_RDWR | O_EXCL, S_IRUSR | S_IWUSR, &attr); ICUNIT_ASSERT_NOT_EQUAL(g_gqueue, (mqd_t)-1, g_gqueue); @@ -101,6 +103,7 @@ EXIT1: EXIT: mq_close(g_gqueue); mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_144.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_144.cpp index c9d07ef412a96515d3d06b78b3901ebc94e31f11..ebed1beb1c71e88c78a0b3e5d5483cdf37307103 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_144.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_144.cpp @@ -92,12 +92,15 @@ static UINT32 Testcase(VOID) pthread_attr_t attr1; pthread_t newTh, newTh2; - memset(&mqstat, 0, sizeof(mqstat)); + ret = memset_s(&mqstat, sizeof(mqstat), 0, sizeof(mqstat)); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); mqstat.mq_maxmsg = MQUEUE_SHORT_ARRAY_LENGTH; mqstat.mq_msgsize = MQUEUE_SHORT_ARRAY_LENGTH * 2; // 2, mqueue message size. mqstat.mq_flags = 0; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq144_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq144_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT3); g_gqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRWXU | S_IRWXG | S_IRWXO, &mqstat); ICUNIT_GOTO_NOT_EQUAL(g_gqueue, (mqd_t)-1, g_gqueue, EXIT); @@ -144,6 +147,7 @@ EXIT1: EXIT: mq_close(g_gqueue); mq_unlink(mqname); +EXIT3: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_145.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_145.cpp index 76ce0c07d13eb430cb230da0925c6101d4b72bd4..feed4ff34780aee277dd1425c09ff6097d31a653 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_145.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_145.cpp @@ -125,12 +125,14 @@ static UINT32 Testcase(VOID) struct mq_attr mqstat; pthread_t pthreadSend1, pthreadSend2, pthreadRecev1, pthreadRecev2; - snprintf(mqname1, MQUEUE_STANDARD_NAME_LENGTH, "/mqueue145_1_%d", LosCurTaskIDGet()); - snprintf(mqname2, MQUEUE_STANDARD_NAME_LENGTH, "/mqueue145_2_%d", LosCurTaskIDGet()); + (void)snprintf_s(mqname1, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mqueue145_1_%d", LosCurTaskIDGet()); + (void)snprintf_s(mqname2, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mqueue145_2_%d", LosCurTaskIDGet()); g_testCount = 0; - memset(&mqstat, 0, sizeof(mqstat)); + (void)memset_s(&mqstat, sizeof(mqstat), 0, sizeof(mqstat)); mqstat.mq_maxmsg = MQUEUE_SHORT_ARRAY_LENGTH; mqstat.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; mqstat.mq_flags = 0; diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_146.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_146.cpp index 256ed91fee427cd79e6175cb6433f2f9a1ecfc0a..35f58de5cf970ab052fc6b4b85f79aff3aa32b8c 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_146.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_146.cpp @@ -98,7 +98,8 @@ static UINT32 Testcase(VOID) oflag = O_CREAT | O_NONBLOCK | O_RDWR; - memset(&mqstat, 0, sizeof(mqstat)); + ret = memset_s(&mqstat, sizeof(mqstat), 0, sizeof(mqstat)); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); mqstat.mq_maxmsg = MQUEUE_SHORT_ARRAY_LENGTH; mqstat.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; mqstat.mq_flags = 0; diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_147.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_147.cpp index 972b09cca1431f387222b079d58d89287e4a0cf2..1955c0ee7f1ae52cfa4b3f6efd1093d06f268788 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_147.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_147.cpp @@ -42,7 +42,9 @@ static UINT32 Testcase(VOID) attr.mq_msgsize = 1; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq147_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq147_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); @@ -65,6 +67,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_148.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_148.cpp index bfad43eaf6e3e8df6fe30a3766d0ae2ded1a626e..afe8bbc242d8b3dac3c07461d4019c7613f515ee 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_148.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_148.cpp @@ -42,7 +42,9 @@ static UINT32 Testcase(VOID) msgAttr.mq_msgsize = 0xFFF0; msgAttr.mq_maxmsg = 0xFFF0; - snprintf(qName, MQUEUE_STANDARD_NAME_LENGTH, "/mq148_%d", LosCurTaskIDGet()); + ret = snprintf_s(qName, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq148_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); g_messageQId = mq_open(qName, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &msgAttr); ICUNIT_GOTO_EQUAL(g_messageQId, (mqd_t)-1, g_messageQId, EXIT); @@ -57,6 +59,7 @@ static UINT32 Testcase(VOID) EXIT: mq_close(g_messageQId); mq_unlink(qName); +EXIT1: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_149.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_149.cpp index 61143620bc312a2aaac9826e38894336d45c8154..82a01595c9d221b120b74f4720f06e37973d2c6e 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_149.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_149.cpp @@ -41,7 +41,9 @@ static UINT32 Testcase(VOID) attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq149_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq149_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_RDWR | O_NONBLOCK, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); @@ -65,6 +67,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_150.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_150.cpp index 6852a595d460782605c8a3ba45550a54662ae954..130ed55882c5bf2345a18b57dbbac35124db6daa 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_150.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_150.cpp @@ -42,7 +42,9 @@ static UINT32 Testcase(VOID) attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq150_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq150_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_RDWR | O_NONBLOCK, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); @@ -66,6 +68,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_151.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_151.cpp index 4874cdf88fda46da8ed65c174cb32d9c4862a274..d3ccfeee2eacfe5bebe57d62c0a1fc03b41da9ae 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_151.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_151.cpp @@ -42,7 +42,9 @@ static UINT32 Testcase(VOID) attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq151_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq151_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_RDWR | O_NONBLOCK, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); @@ -62,6 +64,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_152.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_152.cpp index 822212979b3cb3ca6e583137145b6235f8e356ea..773bc1ee5e52ce7adf14b5757562d4d2c2a9cd40 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_152.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_152.cpp @@ -42,7 +42,9 @@ static UINT32 Testcase(VOID) attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq152_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq152_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT); @@ -65,6 +67,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_153.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_153.cpp index 772418802754b899dc9d54acd92d67eda18aaa21..1e0e72bb2b041baf1d21fb0b6faee4b364867691 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_153.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_153.cpp @@ -42,7 +42,9 @@ static UINT32 Testcase(VOID) attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq153_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq153_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); @@ -65,6 +67,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_154.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_154.cpp index 66a6d6d8a86df789bef7bdcb87230288e092a11a..628595e11c107907be59477067df773397a68e7f 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_154.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_154.cpp @@ -42,7 +42,9 @@ static UINT32 Testcase(VOID) attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq154_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq154_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); @@ -65,6 +67,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_155.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_155.cpp index e916a0457933f636cd8692ac99ceb157361c87aa..53be9f332f5bc4e014131e4bd6969aa66902a6b3 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_155.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_155.cpp @@ -43,7 +43,9 @@ static UINT32 Testcase(VOID) attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq155_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq155_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); @@ -71,6 +73,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_157.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_157.cpp index c369ff84da9a16ba57c2cc59ffb37bd84415c10d..672603e6f79c44c024466eb2c4271c7b9b68655e 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_157.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_157.cpp @@ -44,14 +44,16 @@ static UINT32 Testcase(VOID) attr.mq_maxmsg = MQUEUE_SHORT_ARRAY_LENGTH; for (i = 0; i < count; i++) { - snprintf(mqname[i], MQUEUE_STANDARD_NAME_LENGTH, "mq157_%d_%d", LosCurTaskIDGet(), i); + (void)snprintf_s(mqname[i], MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "mq157_%d_%d", LosCurTaskIDGet(), i); mqueue[i] = mq_open(mqname[i], O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(mqueue[i], (mqd_t)-1, mqueue[i], EXIT); } #ifndef LOSCFG_DEBUG_QUEUE - snprintf(mqname[i], MQUEUE_STANDARD_NAME_LENGTH, "mq157_%d_%d", LosCurTaskIDGet(), i); + (void)snprintf_s(mqname[i], MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "mq157_%d_%d", LosCurTaskIDGet(), i); mqueue[i] = mq_open(mqname[i], O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_EQUAL(mqueue[i], (mqd_t)-1, mqueue[i], EXIT); #endif diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_159.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_159.cpp index 033dc3496b06d35ab5c11292e01aa9aaeae920b1..ddb5c2927d7d51c24e183ad6a13ad5ff4b84bfd3 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_159.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_159.cpp @@ -44,14 +44,16 @@ static UINT32 Testcase(VOID) attr.mq_maxmsg = 20; for (i = 0; i < count; i++) { - snprintf(mqname[i], MQUEUE_STANDARD_NAME_LENGTH, "mq158_%d_%d", LosCurTaskIDGet(), i); + (void)snprintf_s(mqname[i], MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "mq158_%d_%d", LosCurTaskIDGet(), i); mqueue[i] = mq_open(mqname[i], O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(mqueue[i], (mqd_t)-1, mqueue[i], EXIT); } #ifndef LOSCFG_DEBUG_QUEUE - snprintf(mqname[i], MQUEUE_STANDARD_NAME_LENGTH, "/mq158_%d", i); + (void)snprintf_s(mqname[i], MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq158_%d", i); mqueue[i] = mq_open(mqname[i], O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_EQUAL(mqueue[i], (mqd_t)(-1), mqueue[i], EXIT); #else diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_160.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_160.cpp index c451568ba27dd603ccc2dca10c0f566f51991a81..74418345ad883c390c6b5c504d1bb26c0ceae5f5 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_160.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_160.cpp @@ -42,13 +42,15 @@ static VOID *PthreadF01(VOID *arg) attr.mq_maxmsg = 5; // 5, queue max message size. for (i = 0; i < count; i++, g_testCount++) { - snprintf(g_mqueueName[i], MQUEUE_STANDARD_NAME_LENGTH, "/mq160_%d_%d", LosCurTaskIDGet(), i); + (void)snprintf_s(g_mqueueName[i], MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq160_%d_%d", LosCurTaskIDGet(), i); g_mqueueId[i] = mq_open(g_mqueueName[i], O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(g_mqueueId[i], (mqd_t)-1, g_mqueueId[i], EXIT); } #ifndef LOSCFG_DEBUG_QUEUE - snprintf(g_mqueueName[i], MQUEUE_STANDARD_NAME_LENGTH, "/mq160_%d_%d", LosCurTaskIDGet(), i); + (void)snprintf_s(g_mqueueName[i], MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq160_%d_%d", LosCurTaskIDGet(), i); g_mqueueId[i] = mq_open(g_mqueueName[i], O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_EQUAL(g_mqueueId[i], (mqd_t)-1, g_mqueueId[i], EXIT); #endif diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_161.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_161.cpp index ca6949a7e8600381ad62f543a90da1d4571b525e..abaa5b9f6d204d09ac504c50aa77de3e74ab2b2c 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_161.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_161.cpp @@ -44,7 +44,8 @@ static VOID *PthreadF01(VOID *arg) uret = g_index % count; - snprintf(g_mqueueName[uret], MQUEUE_STANDARD_NAME_LENGTH, "/mqueue_161_%d_%d", LosCurTaskIDGet(), (uret)); + (void)snprintf_s(g_mqueueName[uret], MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mqueue_161_%d_%d", LosCurTaskIDGet(), (uret)); g_mqueueId[uret] = mq_open(g_mqueueName[uret], O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(g_mqueueId[uret], (mqd_t)-1, g_mqueueId[uret], EXIT); diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_162.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_162.cpp index 379cf12b39b5a20b8c809b8af9f2c783d8ef3a55..e4f81df38be3398b77ae573887e42c0f5741161f 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_162.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_162.cpp @@ -76,7 +76,6 @@ static UINT32 Testcase(VOID) { INT32 oflag, i, ret = 0; INT32 pthreadCount[MQUEUE_PTHREAD_NUM_TEST]; - CHAR mqname[MQUEUE_STANDARD_NAME_LENGTH] = ""; pthread_t pthreadSend[MQUEUE_PTHREAD_NUM_TEST]; pthread_t pthreadRecev[MQUEUE_PTHREAD_NUM_TEST]; @@ -88,18 +87,16 @@ static UINT32 Testcase(VOID) g_testCount = 0; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq162_%d", LosCurTaskIDGet()); - - memset(&mqstat, 0, sizeof(mqstat)); + (void)snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, + "/mq162_%d", LosCurTaskIDGet()); + (void)memset_s(&mqstat, sizeof(mqstat), 0, sizeof(mqstat)); mqstat.mq_maxmsg = MQUEUE_PTHREAD_NUM_TEST; mqstat.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; mqstat.mq_flags = 0; oflag = O_CREAT | O_NONBLOCK | O_RDWR; - g_gqueue = mq_open(mqname, oflag, S_IRWXU | S_IRWXG | S_IRWXO, &mqstat); ICUNIT_GOTO_NOT_EQUAL(g_gqueue, (mqd_t)-1, g_gqueue, EXIT1); - for (i = 0; i < MQUEUE_PTHREAD_NUM_TEST; i++) { pthreadCount[i] = i; ret = pthread_create(&pthreadSend[i], &attr1, PthreadF01, NULL); diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_163.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_163.cpp index d2113b1878f60f6415ba4ec2ae64fc4587170a05..0a28b4a92cd950107b062b1a853c85664b653b92 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_163.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_163.cpp @@ -42,13 +42,15 @@ static UINT32 Testcase(VOID) attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; for (i = 0; i < (count); i++) { - snprintf(mqname[i], MQUEUE_STANDARD_NAME_LENGTH, "/mq163_%d_%d", LosCurTaskIDGet(), i); + (void)snprintf_s(mqname[i], MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq163_%d_%d", LosCurTaskIDGet(), i); mqueue[i] = mq_open(mqname[i], O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(mqueue[i], (mqd_t)-1, mqueue[i], EXIT); } #ifndef LOSCFG_DEBUG_QUEUE - snprintf(mqname[i], MQUEUE_STANDARD_NAME_LENGTH, "/mq163_%d_%d", LosCurTaskIDGet(), i); + (void)snprintf_s(mqname[i], MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq163_%d_%d", LosCurTaskIDGet(), i); mqueue[i] = mq_open(mqname[i], O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_EQUAL(mqueue[i], (mqd_t)-1, mqueue[i], EXIT1); ICUNIT_GOTO_EQUAL(errno, ENFILE, errno, EXIT1); diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_164.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_164.cpp index 6c26ffc44d1103a11113f13c0c74054af5f91db8..dd04ab0dc325f18ee6fb73684a1d69240cb1d6a8 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_164.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_164.cpp @@ -43,7 +43,9 @@ static UINT32 Testcase(VOID) attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = 3; // 3, queue max message size. - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq164_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq164_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); @@ -75,6 +77,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_165.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_165.cpp index a4408bfa6f89939d504c8e0bbb9ad9824104c13b..3897ffed7fa75e1ac4685415ed6e8b5e976c7e0c 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_165.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_165.cpp @@ -41,7 +41,9 @@ static UINT32 Testcase(VOID) attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = 3; // 3, queue max message size. - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq165_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, + "/mq165_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_RDWR | O_NONBLOCK, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); @@ -66,6 +68,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_166.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_166.cpp index a5cbb49b2ab7a44efaa37ddcc113315cdac914e3..52c8c22bd9e0e38d876d24d4d67e3aabbfc1c8e4 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_166.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_166.cpp @@ -46,7 +46,9 @@ static UINT32 Testcase(VOID) msgAttr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; msgAttr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; - snprintf(qName, MQUEUE_STANDARD_NAME_LENGTH, "/mq166_%d", LosCurTaskIDGet()); + ret = snprintf_s(qName, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq166_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); msgQId = mq_open(qName, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &msgAttr); ICUNIT_GOTO_NOT_EQUAL(msgQId, (mqd_t)-1, msgQId, EXIT); @@ -82,6 +84,7 @@ static UINT32 Testcase(VOID) EXIT: mq_close(msgQId); mq_unlink(qName); +EXIT1: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_168.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_168.cpp index 48f215f3d49da44382f442b280a10adf0eb8a68e..8c6dfc19ad6a487345f5cdbd81f0ab2f5e863d4e 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_168.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_168.cpp @@ -41,7 +41,9 @@ static UINT32 Testcase(VOID) mqd_t mqueue; struct mq_attr attr = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq168_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq168_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_SHORT_ARRAY_LENGTH; @@ -84,6 +86,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_169.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_169.cpp index d161ab4f461e40ed3ed4a8b31a1cd9b2249525e6..3ca47efb763e480acebb5f5536f99163c166a441 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_169.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_169.cpp @@ -41,7 +41,9 @@ static UINT32 Testcase(VOID) struct mq_attr attr = { 0 }; struct timespec ts; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq169_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq169_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_SHORT_ARRAY_LENGTH; @@ -80,6 +82,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_173.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_173.cpp index d87588d4180d5d19459c5e2f8a33563d748e4e35..0db1dfce9142f5e3749a419cb6d71606d7c0c6b2 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_173.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_173.cpp @@ -42,7 +42,9 @@ static UINT32 Testcase(VOID) mqd_t mqueue; struct mq_attr attr = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq173_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq173_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; @@ -69,6 +71,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_175.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_175.cpp index 0fa63e43ae941e8ba7a67e7415957600b548da10..a3c7512c82d1b99b3b7fb46625b51c1cd5e90b9e 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_175.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_175.cpp @@ -40,7 +40,9 @@ static UINT32 Testcase(VOID) struct mq_attr attr = { 0 }; mqd_t mqueue; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq175_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq175_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_SHORT_ARRAY_LENGTH; @@ -85,6 +87,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_176.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_176.cpp index fda61054dfaeb63e8d6bb22781e676f81a939bee..cd7ea7da4772300d23be4e4d1431e29010915d97 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_176.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_176.cpp @@ -41,7 +41,9 @@ static UINT32 Testcase(VOID) mqd_t mqueue; struct mq_attr attr = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq176_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq176_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; @@ -75,6 +77,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_177.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_177.cpp index 574c1bc106dbe62e9bc47274dd4fc4c1163cc2ec..839c2099a2428290e2c1c2c66f3dd82dea1f34f5 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_177.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_177.cpp @@ -41,7 +41,9 @@ static UINT32 Testcase(VOID) mqd_t mqueue; struct mq_attr attr = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq177_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq177_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_SHORT_ARRAY_LENGTH; @@ -71,6 +73,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_187.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_187.cpp index 1a08094b06039e6cec34f3befa812da53aba65c6..1cd1ad3e8aa7d4886269da1354e850a07fe24883 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_187.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_187.cpp @@ -36,7 +36,9 @@ static UINT32 Testcase(VOID) CHAR mqname[MQUEUE_STANDARD_NAME_LENGTH] = ""; mqd_t mqueue; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq187_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq187_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_NONBLOCK, S_IRUSR | S_IWUSR, 0); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); @@ -61,6 +63,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_200.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_200.cpp index c521771d382313db7c6a89fac60d7309bc95028f..cf4bd0763136fb28df45ad2c081c74ee802c2d82 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_200.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_200.cpp @@ -40,7 +40,9 @@ static UINT32 Testcase(VOID) struct timespec ts; struct mq_attr attr = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq200_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq200_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; @@ -68,6 +70,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_201.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_201.cpp index 2ecd50380e89a625e39835c015e00600a0834f90..e37726b4f9211e03d0e37edb77a210b38557142f 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_201.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_201.cpp @@ -44,7 +44,9 @@ static UINT32 Testcase(VOID) attr.mq_msgsize = 20; // 20, queue message size. attr.mq_maxmsg = 20; // 20, queue max message size. - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq201_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq201_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); mqueue = mq_open(mqname, O_CREAT | O_RDWR | O_EXCL, S_IRUSR | S_IWUSR, &attr); ICUNIT_ASSERT_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue); @@ -71,6 +73,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_202.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_202.cpp index 71e2430965755890a1a0c1cc35b81b0236138871..bd5561ee1776191fffad34401e5d7c95df5e22c4 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_202.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_202.cpp @@ -39,7 +39,9 @@ static UINT32 Testcase(VOID) struct timespec ts; struct mq_attr attr = { 0 }; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq202_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq202_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT2); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; @@ -66,6 +68,7 @@ EXIT1: mq_close(mqueue); EXIT: mq_unlink(mqname); +EXIT2: return MQUEUE_NO_ERROR; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_203.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_203.cpp index 09e36c39d04fb90ae3b64e5018cd68cde409f1e1..49fdf3c4547bee6fe8185f1a4e4edbb1ad5f8cce 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_203.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_203.cpp @@ -40,7 +40,9 @@ static UINT32 Testcase(VOID) mqd_t mqueue1, mqueue2; struct timespec ts; - snprintf(mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq203_%d", LosCurTaskIDGet()); + ret = snprintf_s(mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, \ + "/mq203_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; @@ -59,6 +61,7 @@ EXIT: mq_close(mqueue1); mq_close(mqueue2); mq_unlink(mqname); +EXIT1: return LOS_OK; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_204.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_204.cpp index 1f24ce2cf2b32e3a5b7f5735f4514662cba234e3..eac0f683b6754eb72a0d7188c24bf1c9b8bc94cd 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_204.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_204.cpp @@ -74,7 +74,9 @@ STATIC UINT32 Testcase(VOID) pthread_t pthread1, pthread2; pthread_attr_t attr1, attr2; - snprintf(g_mqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq204_%d", LosCurTaskIDGet()); + ret = snprintf_s(g_mqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH, + "/mq204_%d", LosCurTaskIDGet()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); g_attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; g_attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; @@ -93,6 +95,7 @@ STATIC UINT32 Testcase(VOID) EXIT: (VOID)pthread_join(pthread1, NULL); (VOID)pthread_join(pthread2, NULL); +EXIT1: return LOS_OK; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_205.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_205.cpp index aee98dce9f37ad4f20c97da1dca8c0ff3e9737e4..1d9cd9df3cedf59f9bcba029e7e3e2f8973a34ac 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_205.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_205.cpp @@ -58,7 +58,8 @@ static void Child(void) attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = 1; - (void)snprintf_s(g_mqname, MQUEUE_STANDARD_NAME_LENGTH - 1, MQUEUE_STANDARD_NAME_LENGTH, "/mq205_%d", getpid()); + ret = snprintf_s(g_mqname, MQUEUE_STANDARD_NAME_LENGTH - 1, MQUEUE_STANDARD_NAME_LENGTH, "/mq205_%d", getpid()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); g_mqueue = mq_open(g_mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(g_mqueue, (mqd_t)-1, g_mqueue, EXIT); @@ -88,6 +89,7 @@ static void Child(void) EXIT: mq_close(g_mqueue); mq_unlink(g_mqname); +EXIT1: return; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_207.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_207.cpp index 64c591580821fa7410ee892039a8164bed8e1ed0..8823d793635ccafdb6757870fb57fcc652c7c3e5 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_207.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_207.cpp @@ -59,7 +59,8 @@ static void Child(void) attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = 1; - (void)snprintf_s(g_mqname, MQUEUE_STANDARD_NAME_LENGTH - 1, MQUEUE_STANDARD_NAME_LENGTH, "/mq207_%d", getpid()); + ret = snprintf_s(g_mqname, MQUEUE_STANDARD_NAME_LENGTH - 1, MQUEUE_STANDARD_NAME_LENGTH, "/mq207_%d", getpid()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); g_mqueue = mq_open(g_mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(g_mqueue, (mqd_t)-1, g_mqueue, EXIT); @@ -86,6 +87,7 @@ static void Child(void) EXIT: mq_close(g_mqueue); mq_unlink(g_mqname); +EXIT1: return; } diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_208.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_208.cpp index 33282ed252128b607443762ed0de441fbee042c4..fd3ff84d790c6b6d04f70fb3f4654b6a48aeaa52 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_208.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_208.cpp @@ -59,7 +59,8 @@ static void Child(void) attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = 3; // 3, queue max message size. - (void)snprintf_s(g_mqname, MQUEUE_STANDARD_NAME_LENGTH - 1, MQUEUE_STANDARD_NAME_LENGTH, "/mq208_%d", getpid()); + ret = snprintf_s(g_mqname, MQUEUE_STANDARD_NAME_LENGTH - 1, MQUEUE_STANDARD_NAME_LENGTH, "/mq208_%d", getpid()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); g_mqueue = mq_open(g_mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(g_mqueue, (mqd_t)-1, g_mqueue, EXIT); @@ -113,6 +114,7 @@ static void Child(void) EXIT: mq_close(g_mqueue); mq_unlink(g_mqname); +EXIT1: return; } static UINT32 Testcase(VOID) diff --git a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_209.cpp b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_209.cpp index 8bfe39091d1161efbcab978f7b4c7e52bd6391f7..71de8aa81d83a3fe19f2bb635d193c3efc4583e1 100644 --- a/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_209.cpp +++ b/testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_209.cpp @@ -78,7 +78,8 @@ static void Child(void) attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = 3; // 3, queue max message size. - (void)snprintf_s(g_mqname, MQUEUE_STANDARD_NAME_LENGTH - 1, MQUEUE_STANDARD_NAME_LENGTH, "/mq209_%d", getpid()); + ret = snprintf_s(g_mqname, MQUEUE_STANDARD_NAME_LENGTH - 1, MQUEUE_STANDARD_NAME_LENGTH, "/mq209_%d", getpid()); + ICUNIT_GOTO_NOT_EQUAL(ret, MQUEUE_IS_ERROR, ret, EXIT1); g_mqueue = mq_open(g_mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, &attr); ICUNIT_GOTO_NOT_EQUAL(g_mqueue, (mqd_t)-1, g_mqueue, EXIT); @@ -122,6 +123,7 @@ static void Child(void) EXIT: mq_close(g_mqueue); mq_unlink(g_mqname); +EXIT1: return; } static UINT32 Testcase(VOID) diff --git a/testsuites/unittest/libc/posix/mqueue/smoke/It_posix_queue_053.cpp b/testsuites/unittest/libc/posix/mqueue/smoke/It_posix_queue_053.cpp index 01dd6aa2a73fd33b61420bbf4d8c1ce3cba943af..7197681e1548111e54119d7b3affe6a081bad114 100644 --- a/testsuites/unittest/libc/posix/mqueue/smoke/It_posix_queue_053.cpp +++ b/testsuites/unittest/libc/posix/mqueue/smoke/It_posix_queue_053.cpp @@ -87,7 +87,8 @@ static UINT32 Testcase(VOID) pthread_attr_t attr1; pthread_t newTh1, newTh2; - snprintf(g_gqname, MQUEUE_STANDARD_NAME_LENGTH, "/mq053_%d", LosCurTaskIDGet()); + (void)snprintf_s(g_gqname, MQUEUE_STANDARD_NAME_LENGTH, MQUEUE_STANDARD_NAME_LENGTH - 1, + "/mq053_%d", LosCurTaskIDGet()); attr.mq_msgsize = MQUEUE_STANDARD_NAME_LENGTH; attr.mq_maxmsg = MQUEUE_STANDARD_NAME_LENGTH; diff --git a/testsuites/unittest/libc/posix/mqueue/smoke/It_posix_queue_062.cpp b/testsuites/unittest/libc/posix/mqueue/smoke/It_posix_queue_062.cpp index d1ecd7b2216837a1850a996e4f73b297750bc0d7..1b9cbd65f5c7f3057d352ed85f86822deff19aef 100644 --- a/testsuites/unittest/libc/posix/mqueue/smoke/It_posix_queue_062.cpp +++ b/testsuites/unittest/libc/posix/mqueue/smoke/It_posix_queue_062.cpp @@ -44,8 +44,10 @@ static UINT32 Testcase(VOID) mqueue = mq_open(mqname, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR, NULL); ICUNIT_GOTO_NOT_EQUAL(mqueue, (mqd_t)-1, mqueue, EXIT1); - (void)memset_s(&mqstat1, sizeof(mqstat1), 0, sizeof(mqstat1)); - (void)memset_s(&mqstat2, sizeof(mqstat2), 0, sizeof(mqstat2)); + ret = memset_s(&mqstat1, sizeof(mqstat1), 0, sizeof(mqstat1)); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); + ret = memset_s(&mqstat2, sizeof(mqstat2), 0, sizeof(mqstat2)); + ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); ret = mq_getattr(mqueue, &mqstat1); ICUNIT_GOTO_EQUAL(ret, MQUEUE_NO_ERROR, ret, EXIT1); diff --git a/testsuites/unittest/libc/time/timer/smoke/timer_test_005.cpp b/testsuites/unittest/libc/time/timer/smoke/timer_test_005.cpp index 4c739f748495810737179f768a82f49669cf0a87..1d3f929915ab69c9b7f6ee27a08e022911247eab 100644 --- a/testsuites/unittest/libc/time/timer/smoke/timer_test_005.cpp +++ b/testsuites/unittest/libc/time/timer/smoke/timer_test_005.cpp @@ -65,7 +65,8 @@ static int TimerTest(void) int ret; int i; - (void)memset(&sev, 0, sizeof(struct sigevent)); + ret = memset_s(&sev, sizeof(struct sigevent), 0, sizeof(struct sigevent)); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); sev.sigev_notify = SIGEV_THREAD; sev.sigev_notify_function = TempSigHandler; sev.sigev_value.sival_ptr = (void *)TempSigHandler01; diff --git a/testsuites/unittest/net/socket/smoke/net_socket_test_010.cpp b/testsuites/unittest/net/socket/smoke/net_socket_test_010.cpp index 5638d094c1cb00ba36346f79c90e0fbfd448735d..0021c20ce0057ff8b5718bb672b23bd3b026c3d1 100644 --- a/testsuites/unittest/net/socket/smoke/net_socket_test_010.cpp +++ b/testsuites/unittest/net/socket/smoke/net_socket_test_010.cpp @@ -77,7 +77,8 @@ static unsigned IfName2Index(int fd, const char *name) struct ifreq ifr; int ret; - (void)strncpy_s(ifr.ifr_name, sizeof(ifr.ifr_name) - 1, name, sizeof(ifr.ifr_name) - 1); + ret = strncpy_s(ifr.ifr_name, sizeof(ifr.ifr_name) - 1, name, sizeof(ifr.ifr_name) - 1); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); ifr.ifr_name[sizeof(ifr.ifr_name) - 1] = '\0'; ret = ioctl(fd, SIOCGIFINDEX, &ifr); return ret < 0 ? 0 : ifr.ifr_ifindex; diff --git a/testsuites/unittest/process/lock/rwlock/full/pthread_rwlock_test_002.cpp b/testsuites/unittest/process/lock/rwlock/full/pthread_rwlock_test_002.cpp index 075c2aa8f131e5e6f47a483a6503d0f00faea281..babc6f96499d87aead15901d5b563cf9f20b4fe3 100644 --- a/testsuites/unittest/process/lock/rwlock/full/pthread_rwlock_test_002.cpp +++ b/testsuites/unittest/process/lock/rwlock/full/pthread_rwlock_test_002.cpp @@ -227,7 +227,8 @@ static int PthreadRwlockTest(void) int index = 0; int curThreadPri, curThreadPolicy; - (void)memset_s((void *)g_rwlockData, sizeof(int) * TEST_DATA_SIZE, 0, sizeof(int) * TEST_DATA_SIZE); + ret = memset_s((void *)g_rwlockData, sizeof(int) * TEST_DATA_SIZE, 0, sizeof(int) * TEST_DATA_SIZE); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); g_rwlockMask = 0; pthread_rwlock_init(&g_rwlockLock, NULL); diff --git a/testsuites/unittest/process/lock/rwlock/smoke/pthread_rwlock_test_001.cpp b/testsuites/unittest/process/lock/rwlock/smoke/pthread_rwlock_test_001.cpp index c50dda80324f1322260b20850faffe56bb053d85..ddeb572f36015f2c597bdbd415b3fd24774c4d4c 100644 --- a/testsuites/unittest/process/lock/rwlock/smoke/pthread_rwlock_test_001.cpp +++ b/testsuites/unittest/process/lock/rwlock/smoke/pthread_rwlock_test_001.cpp @@ -227,7 +227,8 @@ static int Testcase(void) int index = 0; int curThreadPri, curThreadPolicy; - (void)memset_s((void *)g_rwlockData, sizeof(int) * TEST_DATA_SIZE, 0, sizeof(int) * TEST_DATA_SIZE); + ret = memset_s((void *)g_rwlockData, sizeof(int) * TEST_DATA_SIZE, 0, sizeof(int) * TEST_DATA_SIZE); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); g_rwlockMask = 0; pthread_rwlock_init(&g_rwlockLock, NULL); diff --git a/testsuites/unittest/process/lock/spinlock/smoke/pthread_spinlock_test_001.cpp b/testsuites/unittest/process/lock/spinlock/smoke/pthread_spinlock_test_001.cpp index 96c48729818f56fc0778268903ad16fc08842aff..d03967b1005b819c1cbaa382fd3d9a16c3f41d36 100644 --- a/testsuites/unittest/process/lock/spinlock/smoke/pthread_spinlock_test_001.cpp +++ b/testsuites/unittest/process/lock/spinlock/smoke/pthread_spinlock_test_001.cpp @@ -134,7 +134,8 @@ static int Testcase(void) int index = 0; int curThreadPri, curThreadPolicy; - (void)memset_s((void *)g_spinlockData, sizeof(int) * TEST_DATA_SIZE, 0, sizeof(int) * TEST_DATA_SIZE); + ret = memset_s((void *)g_spinlockData, sizeof(int) * TEST_DATA_SIZE, 0, sizeof(int) * TEST_DATA_SIZE); + ICUNIT_ASSERT_EQUAL(ret, 0, ret); g_spinlockMask = 0; pthread_spin_init(&g_spinlockLock, 0); diff --git a/tools/scripts/make_rootfs/rootfsdir.sh b/tools/scripts/make_rootfs/rootfsdir.sh index eea8604dfa68cbf1cf06dae6124f5da3769e6479..e00cffdfa515c07b99673b167792ebdfda7a85fa 100644 --- a/tools/scripts/make_rootfs/rootfsdir.sh +++ b/tools/scripts/make_rootfs/rootfsdir.sh @@ -44,6 +44,6 @@ if [ -d "${BIN_DIR}" ] && [ "$(ls -A "${BIN_DIR}")" != "" ]; then fi cp -f ${LIB_DIR}/* ${ROOTFS_DIR}/lib -if [ -e ${ETC_DIR}/.mkshrc ]; then +if [ -e "${ETC_DIR}"/.mkshrc ]; then cp -f ${ETC_DIR}/.mkshrc ${ROOTFS_DIR}/etc fi diff --git a/tools/scripts/parse_exc/parse_excinfo.py b/tools/scripts/parse_exc/parse_excinfo.py index 91cfb5c2bb59ae7a8469fbb1a4dcb41727d30ea2..feafa01c00d1755d9fe8c03354fd42d0929d5ba0 100644 --- a/tools/scripts/parse_exc/parse_excinfo.py +++ b/tools/scripts/parse_exc/parse_excinfo.py @@ -1,8 +1,8 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python # -*- coding: utf-8 -*- # Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. -# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved. # # Redistribution and use in source and binary forms, with or without modification, # are permitted provided that the following conditions are met: @@ -66,47 +66,43 @@ def parse_string_line(excinfo_file, string): def parse_kernel_pc_klr(excinfo_file, ohos_image_file, string, addr2line_cmd, objdump_cmd): #parse pc - f = open(excinfo_file, 'r+') - start = 0 - for lines in f.readlines(): - if 'excFrom: kernel' in lines: - if start == 1: - break - start = 1 - if start and string in lines: - lines = lines[lines.find(string):] - strlist = lines.split() - cmd = objdump_cmd + ohos_image_file + ' | grep ' + strlist[2][2:] + ': -B 10 -A 5 -w' - ret = commands.getoutput(cmd) - print(ret) - cmd = addr2line_cmd + ohos_image_file + ' ' + strlist[2] - ret = commands.getoutput(cmd) - ret = ret.split('\n') - print('<' + string + '>' + ret[0] + ' <' + strlist[2] + '>\n') - f.close() - return 0 - f.close() + with open(excinfo_file, 'r+') as f: + start = 0 + for lines in f.readlines(): + if 'excFrom: kernel' in lines: + if start == 1: + break + start = 1 + if start and string in lines: + lines = lines[lines.find(string):] + strlist = lines.split() + cmd = "%s%s | grep %s: -B 10 -A 5 -w" % (objdump_cmd, ohos_image_file, strlist[2][2:]) + ret = commands.getoutput(cmd) + print(ret) + cmd = "%s%s %s" % (addr2line_cmd, ohos_image_file, strlist[2]) + ret = commands.getoutput(cmd) + ret = ret.split('\n') + print("<%s>%s<%s>\n") % (string, ret[0], strlist[2]) + return 0 return -1 def parse_kernel_lr(excinfo_file, ohos_image_file, addr2line_cmd): - f = open(excinfo_file, 'r+') - start = 0 - index = 1 - for lines in f.readlines(): - if 'excFrom: kernel' in lines: - if start == 1: - break - start = 1 - if start and 'lr =' in lines: - lines = lines[lines.find('lr ='):] - strlist = lines.split() - cmd = addr2line_cmd + ohos_image_file + ' ' + strlist[2] - ret = commands.getoutput(cmd) - ret = ret.split('\n') - print('<%.2d'%index + '>' + ret[0] + ' <' + strlist[2] + '>') - index = index + 1 - - f.close() + with open(excinfo_file, 'r+') as f: + start = 0 + index = 1 + for lines in f.readlines(): + if 'excFrom: kernel' in lines: + if start == 1: + break + start = 1 + if start and 'lr =' in lines: + lines = lines[lines.find('lr ='):] + strlist = lines.split() + cmd = "%s%s %s" % (addr2line_cmd, ohos_image_file, strlist[2]) + ret = commands.getoutput(cmd) + ret = ret.split('\n') + print("<%.2d>%s<%s>" % (index, ret[0], strlist[2])) + index = index + 1 def parse_kernel_exc(excinfo_file, ohos_image_file, addr2line_cmd, objdump_cmd): #parse pc, klr @@ -118,56 +114,50 @@ def parse_kernel_exc(excinfo_file, ohos_image_file, addr2line_cmd, objdump_cmd): def parse_user_pc_ulr(excinfo_file, rootfs_dir, string, addr2line_cmd, objdump_cmd): #parse pc - f = open(excinfo_file, 'r+') - start = 0 - for lines in f.readlines(): - if 'excFrom: User' in lines: - if start == 1: - break - start = 1 - if start and string in lines: - lines = lines[lines.find(string):] - strlist = lines.split() - if len(strlist) < 7: - print('%s is error'%string) - f.close() + with open(excinfo_file, 'r+') as f: + start = 0 + for lines in f.readlines(): + if 'excFrom: User' in lines: + if start == 1: + break + start = 1 + if start and string in lines: + lines = lines[lines.find(string):] + strlist = lines.split() + if len(strlist) < 7: + print('%s is error'%string) + return 0 + cmd = "%s%s%s | grep %s: -B 10 -A 5 -w" % (objdump_cmd, rootfs_dir, strlist[4], strlist[6][2:]) + ret = commands.getoutput(cmd) + print(ret) + cmd = "%s%s%s %s" % (addr2line_cmd, rootfs_dir, strlist[4], strlist[6]) + #print(cmd) + ret = commands.getoutput(cmd) + ret = ret.split('\n') + print("<%s>%s<%s><%s>\n" % (string, ret[0], strlist[6], strlist[4])) return 0 - cmd = objdump_cmd + rootfs_dir + strlist[4] + ' | grep ' + strlist[6][2:] + ': -B 10 -A 5 -w' - ret = commands.getoutput(cmd) - print(ret) - cmd = addr2line_cmd + rootfs_dir + strlist[4] + ' ' + strlist[6] - #print(cmd) - ret = commands.getoutput(cmd) - ret = ret.split('\n') - print('<' + string + '>' + ret[0] + ' <' + strlist[6] + '>' + '<' + strlist[4] + '>\n') - f.close() - return 0 - f.close() return -1 def parse_user_lr(excinfo_file, rootfs_dir, addr2line_cmd): - f = open(excinfo_file, 'r+') - start = 0 - index = 1 - for lines in f.readlines(): - if 'excFrom: User' in lines: - if start == 1: - break - start = 1 - if start and 'lr =' in lines: - lines = lines[lines.find('lr ='):] - strlist = lines.split() - if len(strlist) < 11: - print('%s is error'%strlist) - f.close() - return - cmd = addr2line_cmd + rootfs_dir + strlist[8] + ' ' + strlist[10] - res = commands.getoutput(cmd) - res = res.split('\n') - print('<%.2d>'%index + res[0] + ' <' + strlist[10] + '>' + '<' + strlist[8] + '>') - index = index + 1 - - f.close() + with open(excinfo_file, 'r+') as f: + start = 0 + index = 1 + for lines in f.readlines(): + if 'excFrom: User' in lines: + if start == 1: + break + start = 1 + if start and 'lr =' in lines: + lines = lines[lines.find('lr ='):] + strlist = lines.split() + if len(strlist) < 11: + print('%s is error' % strlist) + return + cmd = "%s%s%s %s" % (addr2line_cmd, rootfs_dir, strlist[8], strlist[10]) + res = commands.getoutput(cmd) + res = res.split('\n') + print("<%.2d>%s<%s><%s>" % (index, res[0], strlist[10], strlist[8])) + index = index + 1 def parse_user_exc(excinfo_file, rootfs_dir, addr2line_cmd, objdump_cmd): #parse pc ulr @@ -178,30 +168,29 @@ def parse_user_exc(excinfo_file, rootfs_dir, addr2line_cmd, objdump_cmd): return ret1 and ret2 def parse_backtrace(backtrace_file, ohos_image_file, addr2line_cmd): - f = open(backtrace_file, 'r+') - find = -1 - start = 0 - index = 1 - for lines in f.readlines(): - if 'backtrace begin' in lines: - if start == 1: - break - start = 1 - if start and 'lr =' in lines: - lines = lines[lines.find('lr ='):] - strlist = lines.split() - cmd = addr2line_cmd + ohos_image_file + ' ' + strlist[2] - ret = commands.getoutput(cmd) - ret = ret.split('\n') - print('\n<%.2d'%index + '>' + ret[0] + ' <' + strlist[2] + '>') - index = index + 1 - find = 0 + with open(backtrace_file, 'r+') as f: + find = -1 + start = 0 + index = 1 + for lines in f.readlines(): + if 'backtrace begin' in lines: + if start == 1: + break + start = 1 + if start and 'lr =' in lines: + lines = lines[lines.find('lr ='):] + strlist = lines.split() + cmd = "%s%s %s" % (addr2line_cmd, ohos_image_file, strlist[2]) + ret = commands.getoutput(cmd) + ret = ret.split('\n') + print("\n<%.2d>%s<%s>" % (index, ret[0], strlist[2])) + index = index + 1 + find = 0 - f.close() return find def parse_excinfo(excinfo_file, ohos_image_file, rootfs_dir, addr2line_cmd, objdump_cmd): - cmd = 'dos2unix ' + excinfo_file + cmd = "dos2unix %s" % (excinfo_file) commands.getoutput(cmd) kernel_exc = is_kernel_exc(excinfo_file) user_exc = is_user_exc(excinfo_file) @@ -225,7 +214,7 @@ def parse_compiler(compiler): addr2line_cmd = '' objdump = '' objdump_cmd = '' - cmd = 'which ' + compiler + cmd = "which %s" % (compiler) ret = commands.getoutput(cmd) if ret == '': print('%s is not exist'%compiler) diff --git a/tools/scripts/parse_memory/parse_mem_info.sh b/tools/scripts/parse_memory/parse_mem_info.sh index 38d56859933390db2dbb546cdfe575f94a38a0a4..faf3d7f31262a703550501f03b6e7432a092eb13 100644 --- a/tools/scripts/parse_memory/parse_mem_info.sh +++ b/tools/scripts/parse_memory/parse_mem_info.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. -# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved. # # Redistribution and use in source and binary forms, with or without modification, # are permitted provided that the following conditions are met: @@ -28,6 +28,7 @@ # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +set -e LOAD_BASE="0x2000000" LLVM_ADDR2LINE=llvm-addr2line @@ -36,12 +37,12 @@ GCC_ADDR2LINE=addr2line get_line() { SYM_ADDR=$(echo $1 | awk '{print $2}') - ELF_OFFSET=`echo ${SYM_ADDR} | cut -d '[' -f2 | cut -d ']' -f1` - FILE_LINE=`${ADDR2LINE} -f -e $2 ${ELF_OFFSET} | awk 'NR==2'` + ELF_OFFSET=$(echo ${SYM_ADDR} | cut -d '[' -f2 | cut -d ']' -f1) + FILE_LINE=$(${ADDR2LINE} -f -e $2 ${ELF_OFFSET} | awk 'NR==2'`) if [[ "${FILE_LINE}" == *"?"* ]]; then typeset ELF_OFFSET=$((ELF_OFFSET+LOAD_BASE)) ELF_OFFSET=$(echo "obase=16;${ELF_OFFSET}" | bc) - FILE_LINE=`${ADDR2LINE} -f -e $2 ${ELF_OFFSET} | awk 'NR==2'` + FILE_LINE=$(${ADDR2LINE} -f -e $2 ${ELF_OFFSET} | awk 'NR==2') fi echo ${FILE_LINE} } @@ -58,14 +59,14 @@ parse_line() echo "Error: no such file: $i" exit 1 fi - FILE_LINE=`get_line "$1" $i` - if [[ "${FILE_LINE}" == *"?"* ]] || [ -z "${FILE_LINE}" ]; then + ELF_FILE_LINE=$(get_line "$1" $i) + if [[ "${ELF_FILE_LINE}" == *"?"* ]] || [ -z "${ELF_FILE_LINE}" ]; then echo " * Error: you need ensure whether file: "$i" was compiled with -g or not! *" exit 1 fi - LINE=`echo $1 | tr -d '\r'` + LINE=$(echo $1 | tr -d '\r') LINE=$(echo ${LINE} | awk '{print $1,$2}') - echo " "${LINE}" at "${FILE_LINE} + echo " "${LINE}" at "${ELF_FILE_LINE} FLAG=true break fi @@ -81,7 +82,7 @@ if [ $# -le 1 ]; then fi read -n5 -p "Compiler is [gcc/llvm]: " ANSWER -case ${ANSWER} in +case "${ANSWER}" in (gcc | GCC) which ${GCC_ADDR2LINE} >/dev/null 2>&1 if [ $? -eq 0 ]; then diff --git a/zzz/git/push.sh b/zzz/git/push.sh index 89bf7f67986997d1edbcaa2c579eb37154974028..f47be8de36644faf79929001b21eff4da4b31fc9 100644 --- a/zzz/git/push.sh +++ b/zzz/git/push.sh @@ -1,5 +1,5 @@ git add -A -git commit -m ' 代码格式对齐 +git commit -m ' 完善测试用例 鸿蒙研究站 | http://weharmonyos.com (国内) | https://weharmony.github.io (国外) 论坛 | http://bbs.weharmonyos.com