From bc7d04ce2f6b556756bfba3abc2e5d2005b3fb41 Mon Sep 17 00:00:00 2001 From: tangfan Date: Thu, 22 Sep 2022 11:35:14 +0800 Subject: [PATCH 1/2] fix unused code and bug Signed-off-by: tangfan --- .../src/distributed_hardware_manager.cpp | 11 ----------- .../localhardwaremanager/local_hardware_manager.cpp | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/services/distributedhardwarefwkservice/src/distributed_hardware_manager.cpp b/services/distributedhardwarefwkservice/src/distributed_hardware_manager.cpp index ff4cbc92..a44c44e5 100644 --- a/services/distributedhardwarefwkservice/src/distributed_hardware_manager.cpp +++ b/services/distributedhardwarefwkservice/src/distributed_hardware_manager.cpp @@ -38,17 +38,6 @@ namespace DistributedHardware { #undef DH_LOG_TAG #define DH_LOG_TAG "DistributedHardwareManager" -#ifdef __cplusplus -#define EXTERNC extern "C" -#else -#define EXTERNC -#endif - -EXTERNC __attribute__((visibility("default"))) IDistributedHardwareManager *GetDistributedHardwareManagerInstance() -{ - return &DistributedHardwareManager::GetInstance(); -} - IMPLEMENT_SINGLE_INSTANCE(DistributedHardwareManager); int32_t DistributedHardwareManager::Initialize() diff --git a/services/distributedhardwarefwkservice/src/localhardwaremanager/local_hardware_manager.cpp b/services/distributedhardwarefwkservice/src/localhardwaremanager/local_hardware_manager.cpp index 547c206c..3ab0ae50 100644 --- a/services/distributedhardwarefwkservice/src/localhardwaremanager/local_hardware_manager.cpp +++ b/services/distributedhardwarefwkservice/src/localhardwaremanager/local_hardware_manager.cpp @@ -127,7 +127,7 @@ void LocalHardwareManager::CheckNonExistCapabilityInfo(const std::vector for (auto capabilityInfo : allLocalCapabilityInfos) { std::shared_ptr capabilityValue = capabilityInfo.second; if (capabilityValue == nullptr) { - DHLOGE("capabilityInfo value is nullptr, key: %s", capabilityValue->GetAnonymousKey().c_str()); + DHLOGE("capabilityInfo value is nullptr"); continue; } DHLOGI("The key in allLocalCapabilityInfos is %s", capabilityValue->GetAnonymousKey().c_str()); -- Gitee From b4c4d73a8543851a8f4d98f0cbd347154e42b3fe Mon Sep 17 00:00:00 2001 From: tangfan Date: Thu, 22 Sep 2022 15:23:59 +0800 Subject: [PATCH 2/2] fix unused code and bug Signed-off-by: tangfan --- .../src/componentloader/component_loader.cpp | 8 ++++---- .../src/resourcemanager/capability_info_manager.cpp | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp b/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp index 0188d461..a31fd0d5 100644 --- a/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp +++ b/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp @@ -82,7 +82,7 @@ int32_t ComponentLoader::Init() std::vector ComponentLoader::GetAllCompTypes() { std::vector DHTypeALL; - for (std::map::iterator it = compHandlerMap_.begin(); it != compHandlerMap_.end(); it++) { + for (std::map::iterator it = compHandlerMap_.begin(); it != compHandlerMap_.end(); ++it) { DHTypeALL.push_back(it->first); } return DHTypeALL; @@ -122,7 +122,7 @@ int32_t ComponentLoader::GetCompPathAndVersion(const std::string &jsonStr, std:: std::vector vecJsnCfg = jsonCfg.at(COMPONENTSLOAD_DISTRIBUTED_COMPONENTS).get>(); DHLOGI("get distributed_components CompConfig size is %d", vecJsnCfg.size()); - for (std::vector::iterator iter = vecJsnCfg.begin(); iter != vecJsnCfg.end(); iter++) { + for (std::vector::iterator iter = vecJsnCfg.begin(); iter != vecJsnCfg.end(); ++iter) { dhtypeMap.insert(std::pair((*iter).type, (*iter))); localDHVersion_.compVersions.insert( std::pair((*iter).type, GetCompVersionFromComConfig(*iter))); @@ -179,7 +179,7 @@ void *ComponentLoader::GetHandler(const std::string &soName) void ComponentLoader::GetAllHandler(std::map &dhtypeMap) { std::map::iterator itor; - for (itor = dhtypeMap.begin(); itor != dhtypeMap.end(); itor++) { + for (itor = dhtypeMap.begin(); itor != dhtypeMap.end(); ++itor) { CompHandler comHandler; comHandler.hardwareHandler = GetHandler(itor->second.compHandlerLoc); comHandler.sinkHandler = GetHandler(itor->second.compSinkLoc); @@ -302,7 +302,7 @@ int32_t ComponentLoader::UnInit() DHTraceStart(COMPONENT_RELEASE_START); int32_t ret = DH_FWK_SUCCESS; for (std::map::iterator iter = compHandlerMap_.begin(); - iter != compHandlerMap_.end(); iter++) { + iter != compHandlerMap_.end(); ++iter) { ret += ReleaseHardwareHandler(iter->first); ret += ReleaseSource(iter->first); ret += ReleaseSink(iter->first); diff --git a/services/distributedhardwarefwkservice/src/resourcemanager/capability_info_manager.cpp b/services/distributedhardwarefwkservice/src/resourcemanager/capability_info_manager.cpp index 1516268a..46ee957b 100644 --- a/services/distributedhardwarefwkservice/src/resourcemanager/capability_info_manager.cpp +++ b/services/distributedhardwarefwkservice/src/resourcemanager/capability_info_manager.cpp @@ -266,9 +266,8 @@ std::map> CapabilityInfoManager::Qu { std::lock_guard lock(capInfoMgrMutex_); std::map> capMap; - bool isMatch = true; for (auto &info : globalCapInfoMap_) { - isMatch = true; + bool isMatch = true; for (auto &filter : filters) { if (!IsCapabilityMatchFilter(info.second, filter.first, filter.second)) { isMatch = false; -- Gitee