diff --git a/foundations/ability/utils/include/updateservice_json_utils.h b/foundations/ability/utils/include/updateservice_json_utils.h index d9bb0eb07d7666fd565663c0a9b6aa5270ba8a50..6fa77aefa035b5716e636bcf0cda4e8b9ff56501 100644 --- a/foundations/ability/utils/include/updateservice_json_utils.h +++ b/foundations/ability/utils/include/updateservice_json_utils.h @@ -61,8 +61,7 @@ public: return nullptr; } - if (!cJSON_IsObject(object)) - { + if (!cJSON_IsObject(object)) { cJSON_Delete(object); return nullptr; } @@ -134,10 +133,9 @@ private: return; } - if constexpr (std::is_integral_v && !std::is_same_v) - { + if constexpr (std::is_integral_v && !std::is_same_v) { if (cJSON_IsNumber(item)) { - (sizeof(T) <= sizeof(int)) ? value = static_cast(item->valueint) : + (sizeof(T) <= sizeof(int)) ? value = static_cast(item->valueint) : value = static_cast(item->valuedouble); } } else if constexpr (std::is_floating_point_v) { @@ -151,9 +149,9 @@ private: value = item->valuestring; } } else if constexpr (std::is_same_v>) { - GetValueVecInt(item, value); + GetValueVecInt(item, value); } else if constexpr (std::is_same_v>) { - GetValueVecString(item, value); + GetValueVecString(item, value); } else { return; } diff --git a/services/core/ability/model/include/device_info.h b/services/core/ability/model/include/device_info.h index eabf71ef873d1a10a8ad46fe67b67be22b10db3a..5ba0908fbbcbc8b56cd6d2c48b1b378b931b720c 100644 --- a/services/core/ability/model/include/device_info.h +++ b/services/core/ability/model/include/device_info.h @@ -29,8 +29,7 @@ public: friend void ToJson(cJSON *jsonObject, const DeviceInfo &deviceInfo, bool isPrint) { - if (jsonObject == nullptr) - { + if (jsonObject == nullptr) { return; } diff --git a/services/firmware/check/include/firmware_icheck.h b/services/firmware/check/include/firmware_icheck.h index 0cadca3c63476604635172bea84cacf95b5d4ab8..93d0c2677d01df2c09b1f4412970f02d19021776 100644 --- a/services/firmware/check/include/firmware_icheck.h +++ b/services/firmware/check/include/firmware_icheck.h @@ -106,7 +106,7 @@ public: if (response.status != static_cast(HttpConstant::SUCCESS) || response.content.empty()) { checkStatus = CheckStatus::CHECK_FAIL; } else { - cJSON *root = cJSON_Parse(response.content.c_str()); + cJSON *root = cJSON_Parse(response.content.c_str()); if (!root) { FIRMWARE_LONG_LOGI("FirmwareCheck response: %{public}s", response.content.c_str()); } diff --git a/services/firmware/utils/src/firmware_check_analyze_utils.cpp b/services/firmware/utils/src/firmware_check_analyze_utils.cpp index 7f0fc84534e773ef1c8d741737feb62ad9d2a29d..fe4ac5e02863467d8643e34a7c3c41bce1b03937 100644 --- a/services/firmware/utils/src/firmware_check_analyze_utils.cpp +++ b/services/firmware/utils/src/firmware_check_analyze_utils.cpp @@ -78,10 +78,8 @@ int32_t FirmwareCheckAnalyzeUtils::AnalyzeBlVersionCheckResults(cJSON *root, BlC int32_t ret = CAST_INT(JsonParseError::ERR_OK); int32_t status = CAST_INT(CheckResultStatus::STATUS_SYSTEM_ERROR); UpdateServiceJsonUtils::GetValueAndSetTo(root, "searchStatus", status); - if (status == CAST_INT(CheckResultStatus::STATUS_NEW_VERSION_AVAILABLE)) - { - for (int i = 0; i < cJSON_GetArraySize(itemCheckResults); i++) - { + if (status == CAST_INT(CheckResultStatus::STATUS_NEW_VERSION_AVAILABLE)) { + for (int i = 0; i < cJSON_GetArraySize(itemCheckResults); i++) { auto item = cJSON_GetArrayItem(itemCheckResults, i); BlVersionCheckResult checkResult; ret += UpdateServiceJsonUtils::GetValueAndSetTo(item, "descriptPackageId", checkResult.descriptPackageId); @@ -131,7 +129,7 @@ int32_t FirmwareCheckAnalyzeUtils::AnalyzeComponents(cJSON *root) // 检查 "descriptInfo" 是否存在 cJSON *itemDescriptInfo = cJSON_GetObjectItemCaseSensitive(root, "descriptInfo"); if (!itemDescriptInfo) { - FIRMWARE_LOGE("FirmwareCheckAnalyzeUtils::AnalyzeComponents no key descriptInfo"); + FIRMWARE_LOGE("FirmwareCheckAnalyzeUtils::AnalyzeComponents no key descriptInfo"); return CAST_INT(JsonParseError::MISSING_PROP); }