From 43fb2b8403554a755ca33ae6be7736e723b45905 Mon Sep 17 00:00:00 2001 From: lijiawei Date: Mon, 26 Sep 2022 19:04:15 +0800 Subject: [PATCH] using cpp style type cast instead of c Signed-off-by: lijiawei --- libpurgeablemem/test/purgeable_c_test.cpp | 33 +++++++++++---------- libpurgeablemem/test/purgeable_cpp_test.cpp | 26 ++++++++-------- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/libpurgeablemem/test/purgeable_c_test.cpp b/libpurgeablemem/test/purgeable_c_test.cpp index ae6fd3f..b2c2f0f 100644 --- a/libpurgeablemem/test/purgeable_c_test.cpp +++ b/libpurgeablemem/test/purgeable_c_test.cpp @@ -14,6 +14,7 @@ */ #include +#include #include #include "gtest/gtest.h" @@ -77,24 +78,24 @@ HWTEST_F(PurgeableCTest, MultiObjCreateTest, TestSize.Level1) struct PurgMem *pobj1 = PurgMemCreate(27, InitAlphabet, &initPara); LoopPrintAlphabet(pobj1, 1); struct AlphabetModifyParam a2b = {'A', 'B'}; - ModifyPurgMemByFunc(pobj1, ModifyAlphabetX2Y, (void *)&a2b); + ModifyPurgMemByFunc(pobj1, ModifyAlphabetX2Y, static_cast(&a2b)); LoopPrintAlphabet(pobj1, 1); LoopReclaimPurgeable(1); struct PurgMem *pobj2 = PurgMemCreate(27, InitAlphabet, &initPara); LoopPrintAlphabet(pobj2, 1); - ModifyPurgMemByFunc(pobj2, ModifyAlphabetX2Y, (void *)&a2b); + ModifyPurgMemByFunc(pobj2, ModifyAlphabetX2Y, static_cast(&a2b)); LoopPrintAlphabet(pobj2, 1); if (PurgMemBeginRead(pobj1)) { - ASSERT_STREQ(alphabetFinal, (char *)PurgMemGetContent(pobj1)); + ASSERT_STREQ(alphabetFinal, static_cast(PurgMemGetContent(pobj1))); PurgMemEndRead(pobj1); } else { std::cout << __func__ << ": ERROR! BeginRead failed." << std::endl; } if (PurgMemBeginRead(pobj2)) { - ASSERT_STREQ(alphabetFinal, (char *)PurgMemGetContent(pobj2)); + ASSERT_STREQ(alphabetFinal, static_cast(PurgMemGetContent(pobj2))); PurgMemEndRead(pobj2); } else { std::cout << __func__ << ": ERROR! BeginRead failed." << std::endl; @@ -109,7 +110,7 @@ HWTEST_F(PurgeableCTest, ReadTest, TestSize.Level1) const char alphabet[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ\0"; struct AlphabetInitParam initPara = {'A', 'Z'}; struct PurgMem *pobj = PurgMemCreate(27, InitAlphabet, &initPara); - std::thread reclaimThread(LoopReclaimPurgeable, (unsigned int)(-1)); + std::thread reclaimThread(LoopReclaimPurgeable, UINT_MAX); pthread_t reclaimPid = reclaimThread.native_handle(); reclaimThread.detach(); @@ -120,7 +121,7 @@ HWTEST_F(PurgeableCTest, ReadTest, TestSize.Level1) std::cout << __func__ << ": ERROR! BeginRead failed." << std::endl; continue; } - ASSERT_STREQ(alphabet, (char *)PurgMemGetContent(pobj)); + ASSERT_STREQ(alphabet, static_cast(PurgMemGetContent(pobj))); PurgMemEndRead(pobj); } @@ -133,17 +134,17 @@ HWTEST_F(PurgeableCTest, WriteTest, TestSize.Level1) const char alphabet[] = "CCCDEFGHIJKLMNOPQRSTUVWXYZ\0"; struct AlphabetInitParam initPara = {'A', 'Z'}; struct PurgMem *pobj = PurgMemCreate(27, InitAlphabet, &initPara); - std::thread reclaimThread(LoopReclaimPurgeable, (unsigned int)(-1)); + std::thread reclaimThread(LoopReclaimPurgeable, UINT_MAX); pthread_t reclaimPid = reclaimThread.native_handle(); reclaimThread.detach(); struct AlphabetModifyParam a2b = {'A', 'B'}; struct AlphabetModifyParam b2c = {'B', 'C'}; - ModifyPurgMemByFunc(pobj, ModifyAlphabetX2Y, (void *)&a2b); - ModifyPurgMemByFunc(pobj, ModifyAlphabetX2Y, (void *)&b2c); + ModifyPurgMemByFunc(pobj, ModifyAlphabetX2Y, static_cast(&a2b)); + ModifyPurgMemByFunc(pobj, ModifyAlphabetX2Y, static_cast(&b2c)); if (PurgMemBeginRead(pobj)) { - ASSERT_STREQ(alphabet, (char *)PurgMemGetContent(pobj)); + ASSERT_STREQ(alphabet, static_cast(PurgMemGetContent(pobj))); PurgMemEndRead(pobj); } else { std::cout << __func__ << ": ERROR! BeginRead failed." << std::endl; @@ -160,23 +161,23 @@ HWTEST_F(PurgeableCTest, ReadWriteTest, TestSize.Level1) struct AlphabetInitParam initPara = {'A', 'Z'}; struct PurgMem *pobj = PurgMemCreate(27, InitAlphabet, &initPara); /* loop reclaim thread */ - std::thread reclaimThread(LoopReclaimPurgeable, (unsigned int)(-1)); + std::thread reclaimThread(LoopReclaimPurgeable, UINT_MAX); pthread_t reclaimPid = reclaimThread.native_handle(); reclaimThread.detach(); /* loop read thread */ - std::thread readThread(LoopPrintAlphabet, pobj, (unsigned int)(-1)); + std::thread readThread(LoopPrintAlphabet, pobj, UINT_MAX); pthread_t readPid = readThread.native_handle(); readThread.detach(); struct AlphabetModifyParam a2b = {'A', 'B'}; struct AlphabetModifyParam b2c = {'B', 'C'}; struct AlphabetModifyParam c2d = {'C', 'D'}; - ModifyPurgMemByFunc(pobj, ModifyAlphabetX2Y, (void *)&a2b); - ModifyPurgMemByFunc(pobj, ModifyAlphabetX2Y, (void *)&b2c); - ModifyPurgMemByFunc(pobj, ModifyAlphabetX2Y, (void *)&c2d); + ModifyPurgMemByFunc(pobj, ModifyAlphabetX2Y, static_cast(&a2b)); + ModifyPurgMemByFunc(pobj, ModifyAlphabetX2Y, static_cast(&b2c)); + ModifyPurgMemByFunc(pobj, ModifyAlphabetX2Y, static_cast(&c2d)); if (PurgMemBeginRead(pobj)) { - ASSERT_STREQ(alphabet, (char *)PurgMemGetContent(pobj)); + ASSERT_STREQ(alphabet, static_cast(PurgMemGetContent(pobj))); PurgMemEndRead(pobj); } else { std::cout << __func__ << ": ERROR! BeginRead failed." << std::endl; diff --git a/libpurgeablemem/test/purgeable_cpp_test.cpp b/libpurgeablemem/test/purgeable_cpp_test.cpp index afc2dc7..218c513 100644 --- a/libpurgeablemem/test/purgeable_cpp_test.cpp +++ b/libpurgeablemem/test/purgeable_cpp_test.cpp @@ -16,7 +16,7 @@ #include #include #include /* unique_ptr */ -#include +#include #include "gtest/gtest.h" #include "purgeable_mem.h" @@ -46,7 +46,7 @@ public: if (size <= 0) { return true; } - char *str = (char *)data; + char *str = static_cast(data); size_t len = 0; for (char ch = start; ch <= end && len < size; ch++) { str[len++] = ch; @@ -76,7 +76,7 @@ public: bool Build(void *data, size_t size) { - char *str = (char *)data; + char *str = static_cast(data); for (size_t i = 0; str[i] && i < size; i++) { if (str[i] == from) { str[i] = to; @@ -106,7 +106,7 @@ public: if (size <= 0) { return true; } - char *str = (char *)data; + char *str = static_cast(data); size_t len = 0; for (char ch = target; len < size;) { str[len++] = ch; @@ -174,7 +174,7 @@ HWTEST_F(PurgeableCppTest, MultiObjCreateTest, TestSize.Level1) int times2 = 0; while (times1++ < 10) { if (pobj1.BeginRead()) { - ret1 = strncmp(alphabetFinal, (char *)(pobj1.GetContent()), 26); + ret1 = strncmp(alphabetFinal, static_cast(pobj1.GetContent()), 26); pobj1.EndRead(); break; } else { @@ -184,7 +184,7 @@ HWTEST_F(PurgeableCppTest, MultiObjCreateTest, TestSize.Level1) while (times2++ < 10) { if (pobj2.BeginRead()) { - ret2 = strncmp(alphabetFinal, (char *)(pobj2.GetContent()), 26); + ret2 = strncmp(alphabetFinal, static_cast(pobj2.GetContent()), 26); pobj2.EndRead(); break; } else { @@ -207,7 +207,7 @@ HWTEST_F(PurgeableCppTest, ReadTest, TestSize.Level1) int ret = 1; while (times++ < 10) { if (pobj->BeginRead()) { - ret = strncmp(alphabet, (char *)(pobj->GetContent()), 26); + ret = strncmp(alphabet, static_cast(pobj->GetContent()), 26); pobj->EndRead(); break; } else { @@ -235,7 +235,7 @@ HWTEST_F(PurgeableCppTest, WriteTest, TestSize.Level1) int ret = 1; while (times++ < 10) { if (pobj->BeginRead()) { - ret = strncmp(alphabet, (char *)(pobj->GetContent()), 26); + ret = strncmp(alphabet, static_cast(pobj->GetContent()), 26); pobj->EndRead(); break; } else { @@ -267,7 +267,7 @@ HWTEST_F(PurgeableCppTest, ReadWriteTest, TestSize.Level1) int ret = 1; while (times++ < 10) { if (pobj->BeginRead()) { - ret = strncmp(alphabet, (char *)(pobj->GetContent()), 26); + ret = strncmp(alphabet, static_cast(pobj->GetContent()), 26); pobj->EndRead(); break; } else { @@ -296,7 +296,7 @@ HWTEST_F(PurgeableCppTest, MutiPageReadTest, TestSize.Level1) int ret = 1; while (times++ < 10) { if (pobj->BeginRead()) { - ret = strncmp(alphabet, (char *)(pobj->GetContent()), 4097); + ret = strncmp(alphabet, static_cast(pobj->GetContent()), 4097); pobj->EndRead(); break; } else { @@ -330,7 +330,7 @@ HWTEST_F(PurgeableCppTest, MutiPageWriteTest, TestSize.Level1) int ret = 1; while (times++ < 10) { if (pobj->BeginRead()) { - ret = strncmp(alphabet, (char *)(pobj->GetContent()), 4097); + ret = strncmp(alphabet, static_cast(pobj->GetContent()), 4097); pobj->EndRead(); break; } else { @@ -366,7 +366,7 @@ HWTEST_F(PurgeableCppTest, MutiPageReadWriteTest, TestSize.Level1) int ret = 1; while (times++ < 10) { if (pobj->BeginRead()) { - ret = strncmp(alphabet, (char *)(pobj->GetContent()), 4097); + ret = strncmp(alphabet, static_cast(pobj->GetContent()), 4097); pobj->EndRead(); break; } else { @@ -404,7 +404,7 @@ HWTEST_F(PurgeableCppTest, MutiMorePageReadWriteTest, TestSize.Level1) int ret = 1; while (times++ < 10) { if (pobj->BeginRead()) { - ret = strncmp(alphabet, (char *)(pobj->GetContent()), size - 1); + ret = strncmp(alphabet, static_cast(pobj->GetContent()), size - 1); pobj->EndRead(); break; } else { -- Gitee