From f5d75f742e83795700b5d4b0d6121e5474f6a1af Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Fri, 14 Oct 2022 15:06:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9cppcheck=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E8=B0=83=E6=95=B4=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wanderer-dl122 --- .../src/componentmanager/component_manager.cpp | 2 +- .../src/resourcemanager/db_adapter.cpp | 2 +- .../src/task/monitor_task_timer.cpp | 4 ++-- .../distributedhardwarefwkservice/src/task/offline_task.cpp | 2 +- .../distributedhardwarefwkservice/src/task/online_task.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/services/distributedhardwarefwkservice/src/componentmanager/component_manager.cpp b/services/distributedhardwarefwkservice/src/componentmanager/component_manager.cpp index c53739b6..67f0536d 100644 --- a/services/distributedhardwarefwkservice/src/componentmanager/component_manager.cpp +++ b/services/distributedhardwarefwkservice/src/componentmanager/component_manager.cpp @@ -134,7 +134,7 @@ int32_t ComponentManager::UnInit() DHLOGE("StopSource failed, but want to continue"); } if (!WaitForResult(Action::STOP_SINK, sinkResult)) { - DHLOGE("StopSource failed, but want to continue"); + DHLOGE("StopSink failed, but want to continue"); } compSource_.clear(); diff --git a/services/distributedhardwarefwkservice/src/resourcemanager/db_adapter.cpp b/services/distributedhardwarefwkservice/src/resourcemanager/db_adapter.cpp index bc69c925..ad52d8e7 100644 --- a/services/distributedhardwarefwkservice/src/resourcemanager/db_adapter.cpp +++ b/services/distributedhardwarefwkservice/src/resourcemanager/db_adapter.cpp @@ -157,7 +157,7 @@ void DBAdapter::SyncCompleted(const std::map int32_t DBAdapter::GetDataByKey(const std::string &key, std::string &data) { - DHLOGI("Get data by key: %s", GetAnonyString(key).c_str()); + DHLOGD("Get data by key: %s", GetAnonyString(key).c_str()); std::lock_guard lock(dbAdapterMutex_); if (kvStoragePtr_ == nullptr) { DHLOGE("kvStoragePtr_ is null"); diff --git a/services/distributedhardwarefwkservice/src/task/monitor_task_timer.cpp b/services/distributedhardwarefwkservice/src/task/monitor_task_timer.cpp index d6c0d9b0..1df3b996 100644 --- a/services/distributedhardwarefwkservice/src/task/monitor_task_timer.cpp +++ b/services/distributedhardwarefwkservice/src/task/monitor_task_timer.cpp @@ -114,7 +114,7 @@ void MonitorTaskTimer::StopTimer() void MonitorTaskTimer::Execute(const std::shared_ptr eventHandler) { - DHLOGI("start"); + DHLOGD("start"); if (eventHandler == nullptr) { DHLOGE("eventHandler is nullptr!"); return; @@ -130,7 +130,7 @@ void MonitorTaskTimer::Execute(const std::shared_ptrGetDataByKey(capabilityKey, capInfoPtr) != DH_FWK_SUCCESS) { - DHLOGI("CapabilityInfoManager can not find this key in DB, key: %s, networkId: %s, uuid: %s, dhId: %s", + DHLOGD("CapabilityInfoManager can not find this key in DB, key: %s, networkId: %s, uuid: %s, dhId: %s", GetAnonyString(capabilityKey).c_str(), GetAnonyString(taskParam.networkId).c_str(), GetAnonyString(taskParam.uuid).c_str(), GetAnonyString(taskParam.dhId).c_str()); auto task = TaskFactory::GetInstance().CreateTask(TaskType::DISABLE, taskParam, nullptr); diff --git a/services/distributedhardwarefwkservice/src/task/offline_task.cpp b/services/distributedhardwarefwkservice/src/task/offline_task.cpp index d73ae1f4..de8508e6 100644 --- a/services/distributedhardwarefwkservice/src/task/offline_task.cpp +++ b/services/distributedhardwarefwkservice/src/task/offline_task.cpp @@ -54,7 +54,7 @@ void OffLineTask::DoTaskInner() { DHLOGD("start offline task, id = %s, uuid = %s", GetId().c_str(), GetAnonyString(GetUUID()).c_str()); this->SetTaskState(TaskState::RUNNING); - for (auto& step : this->GetTaskSteps()) { + for (const auto& step : this->GetTaskSteps()) { switch (step) { case TaskStep::UNREGISTER_OFFLINE_DISTRIBUTED_HARDWARE: { CreateDisableTask(); diff --git a/services/distributedhardwarefwkservice/src/task/online_task.cpp b/services/distributedhardwarefwkservice/src/task/online_task.cpp index 8f65bb36..b5475d40 100644 --- a/services/distributedhardwarefwkservice/src/task/online_task.cpp +++ b/services/distributedhardwarefwkservice/src/task/online_task.cpp @@ -47,7 +47,7 @@ void OnLineTask::DoTask() { DHLOGD("start online task, id = %s, uuid = %s", GetId().c_str(), GetAnonyString(GetUUID()).c_str()); this->SetTaskState(TaskState::RUNNING); - for (auto& step : this->GetTaskSteps()) { + for (const auto& step : this->GetTaskSteps()) { switch (step) { case TaskStep::SYNC_ONLINE_INFO: { DoSyncInfo(); -- Gitee