From db681acb0802b7c71663cb65caf7758cfb825995 Mon Sep 17 00:00:00 2001
From: Axi_Beft <shuxin15@h-partners.com>
Date: Wed, 26 Mar 2025 11:00:29 +0800
Subject: [PATCH] datashare cppcheck fix

Signed-off-by: Axi_Beft <shuxin15@h-partners.com>
---
 .../service/data_share/common/kv_delegate.cpp             | 2 +-
 .../service/data_share/common/kv_delegate.h               | 2 +-
 .../service/data_share/common/scheduler_manager.cpp       | 2 +-
 .../service/data_share/data/template_data.cpp             | 8 ++++----
 .../subscriber_managers/rdb_subscriber_manager.h          | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/services/distributeddataservice/service/data_share/common/kv_delegate.cpp b/services/distributeddataservice/service/data_share/common/kv_delegate.cpp
index 06f8cc6a2..ffa0b1320 100644
--- a/services/distributeddataservice/service/data_share/common/kv_delegate.cpp
+++ b/services/distributeddataservice/service/data_share/common/kv_delegate.cpp
@@ -60,7 +60,7 @@ void KvDelegate::RemoveDbFile(bool isBackUp) const
     }
 }
 
-bool KvDelegate::CopyFile(bool isBackup)
+bool KvDelegate::CopyFile(bool isBackup) const
 {
     std::filesystem::copy_options options = std::filesystem::copy_options::overwrite_existing;
     std::error_code code;
diff --git a/services/distributeddataservice/service/data_share/common/kv_delegate.h b/services/distributeddataservice/service/data_share/common/kv_delegate.h
index 3ec92c7cd..770c4a935 100644
--- a/services/distributeddataservice/service/data_share/common/kv_delegate.h
+++ b/services/distributeddataservice/service/data_share/common/kv_delegate.h
@@ -47,7 +47,7 @@ private:
     void Backup();
     void Restore();
     void RemoveDbFile(bool isBackUp) const;
-    bool CopyFile(bool isBackup);
+    bool CopyFile(bool isBackup) const;
     std::recursive_mutex mutex_;
     std::string path_;
     GRD_DB *db_ = nullptr;
diff --git a/services/distributeddataservice/service/data_share/common/scheduler_manager.cpp b/services/distributeddataservice/service/data_share/common/scheduler_manager.cpp
index 79ca80155..bcf582049 100644
--- a/services/distributeddataservice/service/data_share/common/scheduler_manager.cpp
+++ b/services/distributeddataservice/service/data_share/common/scheduler_manager.cpp
@@ -247,7 +247,7 @@ void SchedulerManager::ExecuteSchedulerSQL(const int32_t userId, DistributedData
 }
 
 void SchedulerManager::GenRemindTimerFuncParams(
-    const int32_t userId, DistributedData::StoreMetaData &metaData, const Key &key, std::string &schedulerSQL)
+    const int32_t userId, const DistributedData::StoreMetaData &metaData, const Key &key, std::string &schedulerSQL)
 {
     auto index = schedulerSQL.find(REMIND_TIMER_FUNC);
     if (index == std::string::npos) {
diff --git a/services/distributeddataservice/service/data_share/data/template_data.cpp b/services/distributeddataservice/service/data_share/data/template_data.cpp
index baf5dc4d5..83ba5b888 100644
--- a/services/distributeddataservice/service/data_share/data/template_data.cpp
+++ b/services/distributeddataservice/service/data_share/data/template_data.cpp
@@ -18,16 +18,16 @@
 namespace OHOS::DataShare {
 bool TemplateNode::Marshal(DistributedData::Serializable::json &node) const
 {
-    bool ret = SetValue(node[GET_NAME(update)], update);
-    ret = SetValue(node[GET_NAME(predicates)], predicates);
+    SetValue(node[GET_NAME(update)], update);
+    bool ret = SetValue(node[GET_NAME(predicates)], predicates);
     ret = ret && SetValue(node[GET_NAME(scheduler)], scheduler);
     return ret;
 }
 
 bool TemplateNode::Unmarshal(const DistributedData::Serializable::json &node)
 {
-    bool ret = GetValue(node, GET_NAME(update), update);
-    ret = GetValue(node, GET_NAME(predicates), predicates);
+    GetValue(node, GET_NAME(update), update);
+    bool ret = GetValue(node, GET_NAME(predicates), predicates);
     return ret && GetValue(node, GET_NAME(scheduler), scheduler);
 }
 
diff --git a/services/distributeddataservice/service/data_share/subscriber_managers/rdb_subscriber_manager.h b/services/distributeddataservice/service/data_share/subscriber_managers/rdb_subscriber_manager.h
index 5bb2e82d8..79df3f8bf 100644
--- a/services/distributeddataservice/service/data_share/subscriber_managers/rdb_subscriber_manager.h
+++ b/services/distributeddataservice/service/data_share/subscriber_managers/rdb_subscriber_manager.h
@@ -66,7 +66,7 @@ public:
     void Emit(const std::string &uri, std::shared_ptr<Context> context);
     void Emit(const std::string &uri, int32_t userId, DistributedData::StoreMetaData &metaData);
     void EmitByKey(const Key &key, int32_t userId, const DistributedData::StoreMetaData &metaData);
-    DistributedData::StoreMetaData GenMetaDataFromContext(const std::shared_ptr<Context> context);
+    static DistributedData::StoreMetaData GenMetaDataFromContext(const std::shared_ptr<Context> context);
     std::vector<Key> GetKeysByUri(const std::string &uri);
     void Clear();
 
-- 
Gitee