From 56dd1f62ffe414df0e898752991a43057add00b3 Mon Sep 17 00:00:00 2001 From: liuyaoqian Date: Tue, 7 Jan 2025 09:28:59 +0000 Subject: [PATCH 1/5] Fix static alarms Signed-off-by: liuyaoqian --- .../innerkits/appverify/src/provision/provision_verify.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/innerkits/appverify/src/provision/provision_verify.cpp b/interfaces/innerkits/appverify/src/provision/provision_verify.cpp index 0b2eb12..8e7a92e 100644 --- a/interfaces/innerkits/appverify/src/provision/provision_verify.cpp +++ b/interfaces/innerkits/appverify/src/provision/provision_verify.cpp @@ -252,7 +252,7 @@ void from_json(const cJSON* obj, ProvisionInfo& out) cJSON* jsonValue = cJSON_GetObjectItemCaseSensitive(obj, KEY_APP_SERVICES_CAPABILITIES.c_str()); if (jsonValue != NULL) { char* dumpString = cJSON_Print(jsonValue); - if (dumpString != NULL) { + if (dumpString != nullptr) { out.appServiceCapabilities = dumpString; } cJSON_free(dumpString); -- Gitee From 695973b68335398578fd86783b6b6b457d2e1170 Mon Sep 17 00:00:00 2001 From: liuyaoqian Date: Wed, 8 Jan 2025 01:23:41 +0000 Subject: [PATCH 2/5] Fix static alarms Signed-off-by: liuyaoqian --- .../unittest/src/hap_signing_block_utils_test.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/interfaces/innerkits/appverify/test/unittest/src/hap_signing_block_utils_test.cpp b/interfaces/innerkits/appverify/test/unittest/src/hap_signing_block_utils_test.cpp index 032d400..fa7c503 100644 --- a/interfaces/innerkits/appverify/test/unittest/src/hap_signing_block_utils_test.cpp +++ b/interfaces/innerkits/appverify/test/unittest/src/hap_signing_block_utils_test.cpp @@ -112,10 +112,10 @@ public: void TearDown(); - static const int32_t TEST_ZIP_BLOCKS_NUM_NEED_DIGEST; + static const int32_t testZipBlocksNumNeedDigest; }; -const int32_t HapSigningBlockUtilsTest::TEST_ZIP_BLOCKS_NUM_NEED_DIGEST = 3; +const int32_t HapSigningBlockUtilsTest::testZipBlocksNumNeedDigest = 3; void HapSigningBlockUtilsTest::SetUpTestCase(void) { @@ -365,19 +365,19 @@ HWTEST_F(HapSigningBlockUtilsTest, GetSumOfChunkDigestLenTest001, TestSize.Level */ int32_t chunkCount = 0; int32_t sumOfChunkDigestLen = 0; - DataSource* contents[TEST_ZIP_BLOCKS_NUM_NEED_DIGEST] = { nullptr, nullptr, nullptr }; + DataSource* contents[testZipBlocksNumNeedDigest] = { nullptr, nullptr, nullptr }; bool ret = HapSigningBlockUtils::GetSumOfChunkDigestLen(contents, 0, 0, chunkCount, sumOfChunkDigestLen); ASSERT_FALSE(ret); ret = HapSigningBlockUtils::GetSumOfChunkDigestLen(contents, - TEST_ZIP_BLOCKS_NUM_NEED_DIGEST, 0, chunkCount, sumOfChunkDigestLen); + testZipBlocksNumNeedDigest, 0, chunkCount, sumOfChunkDigestLen); ASSERT_FALSE(ret); HapByteBuffer testBuffer(TEST_ZIP_EOCD_SIZE); HapByteBufferDataSource testSource(testBuffer); - for (int32_t i = 0; i < TEST_ZIP_BLOCKS_NUM_NEED_DIGEST; i++) { + for (int32_t i = 0; i < testZipBlocksNumNeedDigest; i++) { contents[i] = &testSource; } ret = HapSigningBlockUtils::GetSumOfChunkDigestLen(contents, - TEST_ZIP_BLOCKS_NUM_NEED_DIGEST, INT_MAX, chunkCount, sumOfChunkDigestLen); + testZipBlocksNumNeedDigest, INT_MAX, chunkCount, sumOfChunkDigestLen); ASSERT_FALSE(ret); } -- Gitee From a76d09b64a5a853f21991a66ebfd478dc4cabfb4 Mon Sep 17 00:00:00 2001 From: liuyaoqian Date: Thu, 9 Jan 2025 02:31:01 +0000 Subject: [PATCH 3/5] update interfaces/innerkits/appverify/test/unittest/src/hap_signing_block_utils_test.cpp. Signed-off-by: liuyaoqian --- .../unittest/src/hap_signing_block_utils_test.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/interfaces/innerkits/appverify/test/unittest/src/hap_signing_block_utils_test.cpp b/interfaces/innerkits/appverify/test/unittest/src/hap_signing_block_utils_test.cpp index fa7c503..032d400 100644 --- a/interfaces/innerkits/appverify/test/unittest/src/hap_signing_block_utils_test.cpp +++ b/interfaces/innerkits/appverify/test/unittest/src/hap_signing_block_utils_test.cpp @@ -112,10 +112,10 @@ public: void TearDown(); - static const int32_t testZipBlocksNumNeedDigest; + static const int32_t TEST_ZIP_BLOCKS_NUM_NEED_DIGEST; }; -const int32_t HapSigningBlockUtilsTest::testZipBlocksNumNeedDigest = 3; +const int32_t HapSigningBlockUtilsTest::TEST_ZIP_BLOCKS_NUM_NEED_DIGEST = 3; void HapSigningBlockUtilsTest::SetUpTestCase(void) { @@ -365,19 +365,19 @@ HWTEST_F(HapSigningBlockUtilsTest, GetSumOfChunkDigestLenTest001, TestSize.Level */ int32_t chunkCount = 0; int32_t sumOfChunkDigestLen = 0; - DataSource* contents[testZipBlocksNumNeedDigest] = { nullptr, nullptr, nullptr }; + DataSource* contents[TEST_ZIP_BLOCKS_NUM_NEED_DIGEST] = { nullptr, nullptr, nullptr }; bool ret = HapSigningBlockUtils::GetSumOfChunkDigestLen(contents, 0, 0, chunkCount, sumOfChunkDigestLen); ASSERT_FALSE(ret); ret = HapSigningBlockUtils::GetSumOfChunkDigestLen(contents, - testZipBlocksNumNeedDigest, 0, chunkCount, sumOfChunkDigestLen); + TEST_ZIP_BLOCKS_NUM_NEED_DIGEST, 0, chunkCount, sumOfChunkDigestLen); ASSERT_FALSE(ret); HapByteBuffer testBuffer(TEST_ZIP_EOCD_SIZE); HapByteBufferDataSource testSource(testBuffer); - for (int32_t i = 0; i < testZipBlocksNumNeedDigest; i++) { + for (int32_t i = 0; i < TEST_ZIP_BLOCKS_NUM_NEED_DIGEST; i++) { contents[i] = &testSource; } ret = HapSigningBlockUtils::GetSumOfChunkDigestLen(contents, - testZipBlocksNumNeedDigest, INT_MAX, chunkCount, sumOfChunkDigestLen); + TEST_ZIP_BLOCKS_NUM_NEED_DIGEST, INT_MAX, chunkCount, sumOfChunkDigestLen); ASSERT_FALSE(ret); } -- Gitee From 4a941e60066003d2e554178187b0684411bda735 Mon Sep 17 00:00:00 2001 From: liuyaoqian Date: Thu, 9 Jan 2025 02:59:30 +0000 Subject: [PATCH 4/5] Fix static alarms Signed-off-by: liuyaoqian --- .../src/provision/provision_verify.cpp | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/interfaces/innerkits/appverify/src/provision/provision_verify.cpp b/interfaces/innerkits/appverify/src/provision/provision_verify.cpp index 8e7a92e..f5f7c93 100644 --- a/interfaces/innerkits/appverify/src/provision/provision_verify.cpp +++ b/interfaces/innerkits/appverify/src/provision/provision_verify.cpp @@ -81,49 +81,49 @@ const int32_t VERSION_CODE_TWO = 2; void GetStringIfExist(const cJSON* obj, const std::string& key, std::string& out) { - if (obj == NULL || !cJSON_IsObject(obj)) { + if (obj == nullptr || !cJSON_IsObject(obj)) { return; } cJSON* jsonValue = cJSON_GetObjectItemCaseSensitive(obj, key.c_str()); - if (jsonValue != NULL && cJSON_IsString(jsonValue)) { + if (jsonValue != nullptr && cJSON_IsString(jsonValue)) { out = jsonValue->valuestring; } } void GetInt32IfExist(const cJSON* obj, const std::string& key, int32_t& out) { - if (obj == NULL || !cJSON_IsObject(obj)) { + if (obj == nullptr || !cJSON_IsObject(obj)) { return; } cJSON* jsonValue = cJSON_GetObjectItemCaseSensitive(obj, key.c_str()); - if (jsonValue != NULL && cJSON_IsNumber(jsonValue)) { + if (jsonValue != nullptr && cJSON_IsNumber(jsonValue)) { out = jsonValue->valueint; } } void GetInt64IfExist(const cJSON* obj, const std::string& key, int64_t& out) { - if (obj == NULL || !cJSON_IsObject(obj)) { + if (obj == nullptr || !cJSON_IsObject(obj)) { return; } cJSON* jsonValue = cJSON_GetObjectItemCaseSensitive(obj, key.c_str()); - if (jsonValue != NULL && cJSON_IsNumber(jsonValue)) { + if (jsonValue != nullptr && cJSON_IsNumber(jsonValue)) { out = cJSON_GetNumberValue(jsonValue); } } void GetStringArrayIfExist(const cJSON* obj, const std::string& key, std::vector& out) { - if (obj == NULL || !cJSON_IsObject(obj)) { + if (obj == nullptr || !cJSON_IsObject(obj)) { return; } cJSON* jsonArray = cJSON_GetObjectItemCaseSensitive(obj, key.c_str()); - if (jsonArray == NULL || !cJSON_IsArray(jsonArray)) { + if (jsonArray == nullptr || !cJSON_IsArray(jsonArray)) { return; } - cJSON* item = NULL; + cJSON* item = nullptr; cJSON_ArrayForEach(item, jsonArray) { - if (item != NULL && cJSON_IsString(item)) { + if (item != nullptr && cJSON_IsString(item)) { out.emplace_back(item->valuestring); } } @@ -131,7 +131,7 @@ void GetStringArrayIfExist(const cJSON* obj, const std::string& key, std::vector void GetJsonObjectIfExist(const cJSON* obj, const std::string& key, cJSON** out) { - if (obj == NULL || !cJSON_IsObject(obj)) { + if (obj == nullptr || !cJSON_IsObject(obj)) { return; } *out = cJSON_GetObjectItemCaseSensitive(obj, key.c_str()); @@ -174,7 +174,7 @@ void ParseAppDistType(const cJSON* obj, ProvisionInfo& out) void ParseBundleInfo(const cJSON* obj, ProvisionInfo& out) { - cJSON* bundleInfo = NULL; + cJSON* bundleInfo = nullptr; GetJsonObjectIfExist(obj, KEY_BUNDLE_INFO, &bundleInfo); GetStringIfExist(bundleInfo, KEY_DEVELOPER_ID, out.bundleInfo.developerId); GetStringIfExist(bundleInfo, KEY_DEVELOPMENT_CERTIFICATE, out.bundleInfo.developmentCertificate); @@ -188,14 +188,14 @@ void ParseBundleInfo(const cJSON* obj, ProvisionInfo& out) void ParseAcls(const cJSON* obj, ProvisionInfo& out) { - cJSON* acls = NULL; + cJSON* acls = nullptr; GetJsonObjectIfExist(obj, KEY_ACLS, &acls); GetStringArrayIfExist(acls, KEY_ALLOWED_ACLS, out.acls.allowedAcls); } void ParsePermissions(const cJSON* obj, ProvisionInfo& out) { - cJSON* permissions = NULL; + cJSON* permissions = nullptr; GetJsonObjectIfExist(obj, KEY_PERMISSIONS, &permissions); GetStringArrayIfExist(permissions, KEY_RESTRICTED_PERMISSIONS, out.permissions.restrictedPermissions); GetStringArrayIfExist(permissions, KEY_RESTRICTED_CAPABILITIES, out.permissions.restrictedCapabilities); @@ -203,7 +203,7 @@ void ParsePermissions(const cJSON* obj, ProvisionInfo& out) void ParseDebugInfo(const cJSON* obj, ProvisionInfo& out) { - cJSON* debugInfo = NULL; + cJSON* debugInfo = nullptr; GetJsonObjectIfExist(obj, KEY_DEBUG_INFO, &debugInfo); GetStringIfExist(debugInfo, KEY_DEVICE_ID_TYPE, out.debugInfo.deviceIdType); GetStringArrayIfExist(debugInfo, KEY_DEVICE_IDS, out.debugInfo.deviceIds); @@ -211,7 +211,7 @@ void ParseDebugInfo(const cJSON* obj, ProvisionInfo& out) void ParseValidity(const cJSON* obj, Validity& out) { - cJSON* validity = NULL; + cJSON* validity = nullptr; GetJsonObjectIfExist(obj, VALUE_VALIDITY, &validity); GetInt64IfExist(validity, VALUE_NOT_BEFORE, out.notBefore); GetInt64IfExist(validity, VALUE_NOT_AFTER, out.notAfter); @@ -219,7 +219,7 @@ void ParseValidity(const cJSON* obj, Validity& out) void ParseMetadata(const cJSON* obj, ProvisionInfo& out) { - cJSON* baseAppInfo = NULL; + cJSON* baseAppInfo = nullptr; GetJsonObjectIfExist(obj, KEY_BASEAPP_INFO, &baseAppInfo); Metadata metadata; metadata.name = KEY_PACKAGE_NAME; @@ -232,7 +232,7 @@ void ParseMetadata(const cJSON* obj, ProvisionInfo& out) void from_json(const cJSON* obj, ProvisionInfo& out) { - if (obj == NULL || !cJSON_IsObject(obj)) { + if (obj == nullptr || !cJSON_IsObject(obj)) { return; } GetInt32IfExist(obj, KEY_VERSION_CODE, out.versionCode); @@ -250,7 +250,7 @@ void from_json(const cJSON* obj, ProvisionInfo& out) ParseMetadata(obj, out); cJSON* jsonValue = cJSON_GetObjectItemCaseSensitive(obj, KEY_APP_SERVICES_CAPABILITIES.c_str()); - if (jsonValue != NULL) { + if (jsonValue != nullptr) { char* dumpString = cJSON_Print(jsonValue); if (dumpString != nullptr) { out.appServiceCapabilities = dumpString; -- Gitee From 748c6d8754be6b67178f5dc3f7ef83bb4fca7241 Mon Sep 17 00:00:00 2001 From: liuyaoqian Date: Thu, 9 Jan 2025 03:00:43 +0000 Subject: [PATCH 5/5] Fix static alarms Signed-off-by: liuyaoqian --- .../innerkits/appverify/src/provision/provision_verify.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interfaces/innerkits/appverify/src/provision/provision_verify.cpp b/interfaces/innerkits/appverify/src/provision/provision_verify.cpp index f5f7c93..6bdd753 100644 --- a/interfaces/innerkits/appverify/src/provision/provision_verify.cpp +++ b/interfaces/innerkits/appverify/src/provision/provision_verify.cpp @@ -274,7 +274,7 @@ void from_json(const cJSON* obj, ProvisionInfo& out) AppProvisionVerifyResult ParseProvision(const std::string& appProvision, ProvisionInfo& info) { cJSON* obj = cJSON_Parse(appProvision.c_str()); - if (obj == NULL || !cJSON_IsObject(obj)) { + if (obj == nullptr || !cJSON_IsObject(obj)) { cJSON_Delete(obj); return PROVISION_INVALID; } @@ -389,7 +389,7 @@ AppProvisionVerifyResult ParseAndVerify(const std::string& appProvision, Provisi AppProvisionVerifyResult ParseProfile(const std::string& appProvision, ProvisionInfo& info) { cJSON* jsonObj = cJSON_Parse(appProvision.c_str()); - if (jsonObj == NULL || !cJSON_IsObject(jsonObj)) { + if (jsonObj == nullptr || !cJSON_IsObject(jsonObj)) { cJSON_Delete(jsonObj); return PROVISION_INVALID; } -- Gitee