From f2d75a230a30bcef9bb7cb89f999eb76d21d52fa Mon Sep 17 00:00:00 2001
From: li-tiangang4 <litiangang4@huawei.com>
Date: Mon, 14 Mar 2022 17:40:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=85=E6=BA=90=E6=A3=80=E8=A7=86=E6=84=8F?=
 =?UTF-8?q?=E8=A7=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: li-tiangang4 <litiangang4@huawei.com>
---
 common/log/include/distributed_hardware_log.h                 | 2 +-
 common/utils/include/constants.h                              | 2 +-
 common/utils/include/single_instance.h                        | 2 +-
 sa_profile/4801.xml                                           | 4 ++--
 .../src/accessmanager/access_manager.cpp                      | 4 +++-
 .../src/distributed_hardware_service.cpp                      | 1 +
 .../src/componentloader/component_loader.cpp                  | 2 +-
 7 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/common/log/include/distributed_hardware_log.h b/common/log/include/distributed_hardware_log.h
index 9b02114c..00eff7bc 100644
--- a/common/log/include/distributed_hardware_log.h
+++ b/common/log/include/distributed_hardware_log.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/common/utils/include/constants.h b/common/utils/include/constants.h
index 3aa1d18e..a32644e6 100644
--- a/common/utils/include/constants.h
+++ b/common/utils/include/constants.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/common/utils/include/single_instance.h b/common/utils/include/single_instance.h
index 11a86f69..8c9fd428 100644
--- a/common/utils/include/single_instance.h
+++ b/common/utils/include/single_instance.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/sa_profile/4801.xml b/sa_profile/4801.xml
index 87bbf234..1c5961fa 100644
--- a/sa_profile/4801.xml
+++ b/sa_profile/4801.xml
@@ -15,11 +15,11 @@
  -->
 <info>
     <process>dhardware</process>
-    <systemability> <!-- Declare a sytem ability and its profile -->
+    <systemability> <!-- Declare a system ability and its profile -->
         <name>4801</name> <!-- Declare the name of system ability -->
         <libpath>libdistributedhardwarefwksvr.z.so</libpath> <!-- Declare the path of .so file which includes the system ability; Note: 1 .so file can have 1 to N system abilities. -->
         <depend>4802</depend>  <!-- Declare the name of system abilities which the system ability depends on, using ";" as separator among names. If there are dependencies, it needs to check if all those dependencies are avliable in service manager before starting the system ability. -->
-        <depend-time-out>60000</depend-time-out>  <!-- Check all dependencies are avaliable before the timeout period ended. The MAX_DEPENDENCY_TIMEOUT is 60s. -->
+        <depend-time-out>60000</depend-time-out>  <!-- Check all dependencies are available before the timeout period ended. The MAX_DEPENDENCY_TIMEOUT is 60s. -->
         <run-on-create>true</run-on-create> <!-- "true" means the system ability would start imediately, "false" means the system ability would start on demand. -->
         <distributed>true</distributed> <!-- "true" means the system ability supports distributed scheduling while "false" is not. -->
         <dump-level>1</dump-level> <!-- Declare the dump level. 1-high; 2-media; 3-low -->
diff --git a/services/distributedhardwarefwkservice/src/accessmanager/access_manager.cpp b/services/distributedhardwarefwkservice/src/accessmanager/access_manager.cpp
index 190ea5b1..02d3aa7e 100644
--- a/services/distributedhardwarefwkservice/src/accessmanager/access_manager.cpp
+++ b/services/distributedhardwarefwkservice/src/accessmanager/access_manager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -140,11 +140,13 @@ void AccessManager::OnDeviceOffline(const DmDeviceInfo &deviceInfo)
 
 void AccessManager::OnDeviceReady(const DmDeviceInfo &deviceInfo)
 {
+    (void)deviceInfo;
     return;
 }
 
 void AccessManager::OnDeviceChanged(const DmDeviceInfo &deviceInfo)
 {
+    (void)deviceInfo;
     return;
 }
 
diff --git a/services/distributedhardwarefwkservice/src/distributed_hardware_service.cpp b/services/distributedhardwarefwkservice/src/distributed_hardware_service.cpp
index 3c2351f7..cc28e1f8 100644
--- a/services/distributedhardwarefwkservice/src/distributed_hardware_service.cpp
+++ b/services/distributedhardwarefwkservice/src/distributed_hardware_service.cpp
@@ -79,6 +79,7 @@ void DistributedHardwareService::OnStop()
 
 int32_t DistributedHardwareService::QuerySinkVersion(std::unordered_map<DHType, std::string> &versionMap)
 {
+    (void)versionMap;
     return 0;
 }
 }
diff --git a/services/distributedhardwarefwkserviceimpl/src/componentloader/component_loader.cpp b/services/distributedhardwarefwkserviceimpl/src/componentloader/component_loader.cpp
index 17881f2f..9d262bbb 100644
--- a/services/distributedhardwarefwkserviceimpl/src/componentloader/component_loader.cpp
+++ b/services/distributedhardwarefwkserviceimpl/src/componentloader/component_loader.cpp
@@ -127,7 +127,7 @@ int32_t ComponentLoader::GetLocalDHVersion(DHVersion &dhVersion)
 void *ComponentLoader::GetHandler(const std::string &soName)
 {
     if (soName.length() <= 0) {
-        DHLOGE("%s soName length is 0");
+        DHLOGE("%s soName length is 0", soName.c_str());
         return nullptr;
     }
     char path[PATH_MAX + 1] = {0x00};
-- 
Gitee