diff --git a/base/src/thread_ex.cpp b/base/src/thread_ex.cpp index 3ba97b25b7ce16d5e4f7be5d27f52d56bc670103..e9181d466e29ce3f8546c0e1ef3611a700ada3e1 100644 --- a/base/src/thread_ex.cpp +++ b/base/src/thread_ex.cpp @@ -159,7 +159,7 @@ ThreadStatus Thread::NotifyExitSync() std::unique_lock lk(lock_); exitPending_ = true; - while (running_ == true) { + while (running_) { cvThreadExited_.wait(lk); } diff --git a/base/test/unittest/common/utils_securec_test.cpp b/base/test/unittest/common/utils_securec_test.cpp index c4afcedc9e84fc59c49d17021899074f08459a07..e07af92bcf1f2319a58f653babe6b33d2b81405c 100644 --- a/base/test/unittest/common/utils_securec_test.cpp +++ b/base/test/unittest/common/utils_securec_test.cpp @@ -51,14 +51,14 @@ void UtilsSecurecTest::TearDown(void) HWTEST_F(UtilsSecurecTest, test_memset_s_01, TestSize.Level0) { char cBase[20]; - errno_t result = memset_s((void*)cBase, sizeof(char) * 20, 1, sizeof(char) * 20); + errno_t result = memset_s(reinterpret_cast(cBase), sizeof(char) * 20, 1, sizeof(char) * 20); EXPECT_EQ(result, 0); } HWTEST_F(UtilsSecurecTest, test_memset_s_02, TestSize.Level0) { char cBase[20]; - errno_t result = memset_s((void*)cBase, sizeof(char) * 20, 1, sizeof(char) * 21); + errno_t result = memset_s(reinterpret_cast(cBase), sizeof(char) * 20, 1, sizeof(char) * 21); EXPECT_NE(result, 0); } @@ -66,7 +66,7 @@ HWTEST_F(UtilsSecurecTest, test_memcpy_s_01, TestSize.Level0) { char cBase[20] = "memcpy_s"; char cTemp[20]; - errno_t result = memcpy_s((void*)cTemp, sizeof(char) * 20, cBase, sizeof(cBase)); + errno_t result = memcpy_s(reinterpret_cast(cTemp), sizeof(char) * 20, cBase, sizeof(cBase)); EXPECT_EQ(result, 0); EXPECT_EQ(0, strcmp(cTemp, cBase)); } @@ -75,7 +75,7 @@ HWTEST_F(UtilsSecurecTest, test_memcpy_s_02, TestSize.Level0) { char cBase[20] = "memcpy_s"; char cTemp[5]; - errno_t result = memcpy_s((void*)cTemp, sizeof(char) * 5, cBase, sizeof(cBase)); + errno_t result = memcpy_s(reinterpret_cast(cTemp), sizeof(char) * 5, cBase, sizeof(cBase)); EXPECT_NE(result, 0); } @@ -138,4 +138,4 @@ HWTEST_F(UtilsSecurecTest, test_sprintf_s_01, TestSize.Level0) errno_t result = sprintf_s(cBase, sizeof(cBase), "%d", 12345); EXPECT_EQ(string(cBase), "12345"); EXPECT_NE(result, 0); -} +} \ No newline at end of file