From 694c535b587ec451eeb6a90a97693d9e56c50312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Tue, 5 Sep 2023 10:13:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9map=EF=BC=8Cvector=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=20Signed-off-by:=20=E9=82=B9=E5=8F=8B?= =?UTF-8?q?=E6=9D=BE=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frameworks/js/napi/base/include/session_manager.h | 2 +- services/core/ability/alarm/include/alarm_manager.h | 2 +- services/core/ability/alarm/include/timer_manager.h | 2 +- services/core/ability/download/data/include/download_info.h | 2 +- services/engine/include/update_service.h | 2 +- services/engine/include/update_service_impl_manager.h | 2 +- services/engine/include/update_service_stub.h | 2 +- services/firmware/check/include/firmware_icheck.h | 2 +- .../data_processor/include/firmware_check_data_processor.h | 2 +- .../firmware/upgrade/executor/include/firmware_check_executor.h | 2 +- .../upgrade/executor/include/firmware_download_executor.h | 2 +- .../upgrade/executor/include/firmware_install_executor.h | 2 +- services/firmware/utils/include/firmware_check_analyze_utils.h | 2 +- services/startup/access/include/access_manager.h | 2 +- services/utils/include/dupdate_net_manager.h | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/frameworks/js/napi/base/include/session_manager.h b/frameworks/js/napi/base/include/session_manager.h index c0be3ac..3a3b31f 100644 --- a/frameworks/js/napi/base/include/session_manager.h +++ b/frameworks/js/napi/base/include/session_manager.h @@ -47,7 +47,7 @@ private: napi_env env_ {}; napi_ref thisReference_ {}; - std::map> sessions_ {}; + std::map> sessions_; #ifndef UPDATER_API_TEST std::recursive_mutex sessionMutex_; #endif diff --git a/services/core/ability/alarm/include/alarm_manager.h b/services/core/ability/alarm/include/alarm_manager.h index efd9ad3..6b0cbe0 100644 --- a/services/core/ability/alarm/include/alarm_manager.h +++ b/services/core/ability/alarm/include/alarm_manager.h @@ -50,7 +50,7 @@ private: AlarmType alarmType_; std::string logTag_; int32_t timeLooperInterval_ = AlarmLooper::DEFAULT_LOOPER_INTERVAL; - std::map callbackMap_ {}; + std::map callbackMap_; }; } // namespace UpdateEngine } // namespace OHOS diff --git a/services/core/ability/alarm/include/timer_manager.h b/services/core/ability/alarm/include/timer_manager.h index 96f4c4e..87f2e41 100644 --- a/services/core/ability/alarm/include/timer_manager.h +++ b/services/core/ability/alarm/include/timer_manager.h @@ -41,7 +41,7 @@ private: void BuildTimer(); private: - std::map lastRegisterTimeIdMap_ {}; + std::map lastRegisterTimeIdMap_; std::shared_ptr timer_ = nullptr; std::mutex mutex_; }; diff --git a/services/core/ability/download/data/include/download_info.h b/services/core/ability/download/data/include/download_info.h index 6c0a76f..ac944ee 100644 --- a/services/core/ability/download/data/include/download_info.h +++ b/services/core/ability/download/data/include/download_info.h @@ -37,7 +37,7 @@ public: std::string reserveUrl; std::string path; std::string veriftInfo; - std::map header {}; + std::map header; std::string requestBody; int32_t retryTimes = 0; int64_t packageSize = 0; diff --git a/services/engine/include/update_service.h b/services/engine/include/update_service.h index 92f815f..44f284a 100644 --- a/services/engine/include/update_service.h +++ b/services/engine/include/update_service.h @@ -133,7 +133,7 @@ public: private: std::mutex clientProxyMapLock_; - std::map clientProxyMap_ {}; + std::map clientProxyMap_; static sptr updateService_; std::shared_ptr updateImplMgr_ = nullptr; }; diff --git a/services/engine/include/update_service_impl_manager.h b/services/engine/include/update_service_impl_manager.h index f9d3cad..66186d6 100644 --- a/services/engine/include/update_service_impl_manager.h +++ b/services/engine/include/update_service_impl_manager.h @@ -36,7 +36,7 @@ public: private: std::mutex updateImplMapLock_; - std::map> updateImpMap_ {}; + std::map> updateImpMap_; }; } // namespace UpdateEngine } // namespace OHOS diff --git a/services/engine/include/update_service_stub.h b/services/engine/include/update_service_stub.h index 5e81be0..14fe1c8 100644 --- a/services/engine/include/update_service_stub.h +++ b/services/engine/include/update_service_stub.h @@ -81,7 +81,7 @@ private: bool IsPermissionGranted(uint32_t code); private: - std::map requestFuncMap_ {}; + std::map requestFuncMap_; }; } // namespace UpdateEngine } // namespace OHOS diff --git a/services/firmware/check/include/firmware_icheck.h b/services/firmware/check/include/firmware_icheck.h index 40f3394..4fc02ee 100644 --- a/services/firmware/check/include/firmware_icheck.h +++ b/services/firmware/check/include/firmware_icheck.h @@ -167,7 +167,7 @@ private: RequestType requestType_ = RequestType::CHECK; Duration duration_ {}; CheckAndAuthInfo checkAndAuthInfo_ {}; - std::vector checkResultList_ {}; + std::vector checkResultList_; }; } // namespace UpdateEngine } // namespace OHOS diff --git a/services/firmware/upgrade/data_processor/include/firmware_check_data_processor.h b/services/firmware/upgrade/data_processor/include/firmware_check_data_processor.h index 739f495..fdddae5 100644 --- a/services/firmware/upgrade/data_processor/include/firmware_check_data_processor.h +++ b/services/firmware/upgrade/data_processor/include/firmware_check_data_processor.h @@ -56,7 +56,7 @@ private: void BuildVersionDigest(NewVersionInfo &newVersionInfo, const std::vector &componentList); private: - std::vector componentList_ {}; + std::vector componentList_; Duration duration_ {}; bool isSameWithDb_ = true; CheckStatus status_ = CheckStatus::CHECK_FAIL; diff --git a/services/firmware/upgrade/executor/include/firmware_check_executor.h b/services/firmware/upgrade/executor/include/firmware_check_executor.h index 2b4ef8d..c931e72 100644 --- a/services/firmware/upgrade/executor/include/firmware_check_executor.h +++ b/services/firmware/upgrade/executor/include/firmware_check_executor.h @@ -39,7 +39,7 @@ private: FirmwareCheckComponentCallback checkComponentCallback_ {}; Duration duration_ {}; CheckAndAuthInfo checkAndAuthInfo_ {}; - std::vector componentList_ {}; + std::vector componentList_; CheckStatus status_ = CheckStatus::CHECK_SUCCESS; }; } // namespace UpdateEngine diff --git a/services/firmware/upgrade/executor/include/firmware_download_executor.h b/services/firmware/upgrade/executor/include/firmware_download_executor.h index e17cf13..5105014 100644 --- a/services/firmware/upgrade/executor/include/firmware_download_executor.h +++ b/services/firmware/upgrade/executor/include/firmware_download_executor.h @@ -40,7 +40,7 @@ private: private: DownloadOptions downloadOptions_ {}; - std::vector components_ {}; + std::vector components_; FirmwareProgressCallback firmwareProgressCallback_ {}; FirmwareTask tasks_ {}; UpgradeStatus upgradeStatus_; diff --git a/services/firmware/upgrade/executor/include/firmware_install_executor.h b/services/firmware/upgrade/executor/include/firmware_install_executor.h index 4753b72..5580552 100644 --- a/services/firmware/upgrade/executor/include/firmware_install_executor.h +++ b/services/firmware/upgrade/executor/include/firmware_install_executor.h @@ -42,7 +42,7 @@ private: InstallType installType_; FirmwareInstallExecutorCallback installCallback_; InstallCallbackInfo installCallbackInfo_; - std::vector components_ {}; + std::vector components_; FirmwareTask tasks_ {}; Progress taskProgress_ {}; std::shared_ptr preferencesUtil_ = diff --git a/services/firmware/utils/include/firmware_check_analyze_utils.h b/services/firmware/utils/include/firmware_check_analyze_utils.h index 12648a3..e56d9c1 100644 --- a/services/firmware/utils/include/firmware_check_analyze_utils.h +++ b/services/firmware/utils/include/firmware_check_analyze_utils.h @@ -39,7 +39,7 @@ private: int32_t AnalyzeBlVersionCheckResults(nlohmann::json &root, BlCheckResponse &response); private: - std::vector components_ {}; + std::vector components_; }; } // namespace UpdateEngine } // namespace OHOS diff --git a/services/startup/access/include/access_manager.h b/services/startup/access/include/access_manager.h index d5b4bd0..eb24e0a 100644 --- a/services/startup/access/include/access_manager.h +++ b/services/startup/access/include/access_manager.h @@ -53,7 +53,7 @@ public: private: std::recursive_mutex mutex_; - std::map> accessMap_ {}; + std::map> accessMap_; bool isRemoteIdle_ = true; }; } // namespace UpdateEngine diff --git a/services/utils/include/dupdate_net_manager.h b/services/utils/include/dupdate_net_manager.h index 86a5fc5..43a462a 100644 --- a/services/utils/include/dupdate_net_manager.h +++ b/services/utils/include/dupdate_net_manager.h @@ -52,7 +52,7 @@ private: sptr observer_ = nullptr; std::mutex netChangeMutex_; NetType netType_ = NetType::NO_NET; - std::map netChangeCallbackMap_ {}; + std::map netChangeCallbackMap_; }; } // namespace UpdateEngine } // namespace OHOS