From 2b1aebf6c0723910fc4e8a0cd34e68ce2bfdff8d Mon Sep 17 00:00:00 2001 From: kou-chuxiong Date: Sun, 28 Sep 2025 16:26:06 +0800 Subject: [PATCH] fix condition is not bool Signed-off-by: kou-chuxiong Change-Id: Ica9dfe43977bbd0d88f38569f2807d10cb743746 --- common_lib/impl/src/json_utils.c | 2 +- deps_adapter/os_adapter/impl/src/hc_task_thread.c | 2 +- .../cred_data_manager/src/credential_data_manager.c | 2 +- .../data_manager/group_data_manager/src/group_data_manager.c | 2 +- test/unittest/deviceauth/unit_test/source/common_lib_test.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common_lib/impl/src/json_utils.c b/common_lib/impl/src/json_utils.c index 2c419bb8..7f2f921b 100644 --- a/common_lib/impl/src/json_utils.c +++ b/common_lib/impl/src/json_utils.c @@ -170,7 +170,7 @@ static void ReplaceStringToInt(char *input, const char *keyName) if (shouldReplace) { uint32_t readI = startOffset + SPLIT_LEN_ONE; uint32_t writeI = startOffset; - while (input[readI]) { + while (input[readI] != '\0') { input[writeI] = input[readI]; readI++; writeI++; diff --git a/deps_adapter/os_adapter/impl/src/hc_task_thread.c b/deps_adapter/os_adapter/impl/src/hc_task_thread.c index f27529de..4fbf2144 100644 --- a/deps_adapter/os_adapter/impl/src/hc_task_thread.c +++ b/deps_adapter/os_adapter/impl/src/hc_task_thread.c @@ -100,7 +100,7 @@ static int TaskThreadLoop(void* args) return -1; } - while (1) { + while (true) { if (thread->quit) { LOGW("thread quit!"); break; diff --git a/services/data_manager/cred_data_manager/src/credential_data_manager.c b/services/data_manager/cred_data_manager/src/credential_data_manager.c index 68b037dc..87c26df9 100644 --- a/services/data_manager/cred_data_manager/src/credential_data_manager.c +++ b/services/data_manager/cred_data_manager/src/credential_data_manager.c @@ -135,7 +135,7 @@ static bool LoadStringVectorFromParcel(StringVector *vec, HcParcel *parcel) return false; } } - } while (1); + } while (true); } static bool SaveStringVectorToParcel(const StringVector *vec, HcParcel *parcel) diff --git a/services/data_manager/group_data_manager/src/group_data_manager.c b/services/data_manager/group_data_manager/src/group_data_manager.c index ea8be9cb..ffde436c 100644 --- a/services/data_manager/group_data_manager/src/group_data_manager.c +++ b/services/data_manager/group_data_manager/src/group_data_manager.c @@ -167,7 +167,7 @@ static bool LoadStringVectorFromParcel(StringVector *vec, HcParcel *parcel) return false; } } - } while (1); + } while (true); } static bool SaveStringVectorToParcel(const StringVector *vec, HcParcel *parcel) diff --git a/test/unittest/deviceauth/unit_test/source/common_lib_test.cpp b/test/unittest/deviceauth/unit_test/source/common_lib_test.cpp index fcd837ac..d10495c0 100644 --- a/test/unittest/deviceauth/unit_test/source/common_lib_test.cpp +++ b/test/unittest/deviceauth/unit_test/source/common_lib_test.cpp @@ -824,7 +824,7 @@ HWTEST_F(CommonLibTest, ParseTlvNodeTest001, TestSize.Level0) HWTEST_F(CommonLibTest, IsStrEqualTest001, TestSize.Level0) { - EXPECT_EQ(IsStrEqual(nullptr, nullptr), false); + EXPECT_EQ(IsStrEqual(nullptr, nullptr), true); EXPECT_EQ(IsStrEqual("123", nullptr), false); EXPECT_EQ(IsStrEqual(nullptr, "123"), false); EXPECT_EQ(IsStrEqual("123", "123"), true);