From bd5055f0079db9d1bd457f83e5fb442c7cd7094c Mon Sep 17 00:00:00 2001 From: tangfan <1824525929@qq.com> Date: Thu, 10 Mar 2022 19:17:55 +0800 Subject: [PATCH] fix codex Signed-off-by: tangfan <1824525929@qq.com> --- .../src/distributed_hardware_stub.cpp | 2 -- .../include/resourcemanager/db_adapter.h | 2 +- .../include/task/offline_task.h | 1 - .../src/componentmanager/component_disable.cpp | 2 -- .../src/componentmanager/component_enable.cpp | 2 -- .../src/resourcemanager/capability_info_manager.cpp | 9 ++++----- .../src/resourcemanager/capability_utils.cpp | 4 ---- .../src/resourcemanager/db_adapter.cpp | 5 ----- .../src/task/enable_task.cpp | 3 --- .../test/unittest/common/task/src/mock_disable_task.cpp | 3 --- .../test/unittest/common/task/src/mock_enable_task.cpp | 3 --- .../test/unittest/common/task/src/mock_offline_task.cpp | 3 --- .../test/unittest/common/task/src/mock_online_task.cpp | 3 --- utils/src/anonymous_string.cpp | 7 ++----- utils/test/unittest/common/eventbus/event_bus_test.cpp | 8 ++++++++ utils/test/unittest/common/eventbus/event_bus_test.h | 6 ------ 16 files changed, 15 insertions(+), 48 deletions(-) diff --git a/services/distributedhardwarefwkservice/src/distributed_hardware_stub.cpp b/services/distributedhardwarefwkservice/src/distributed_hardware_stub.cpp index 0ebbe34a..8de7e742 100644 --- a/services/distributedhardwarefwkservice/src/distributed_hardware_stub.cpp +++ b/services/distributedhardwarefwkservice/src/distributed_hardware_stub.cpp @@ -15,8 +15,6 @@ #include "distributed_hardware_stub.h" -#include - #include "anonymous_string.h" #include "constants.h" #include "distributed_hardware_errno.h" diff --git a/services/distributedhardwarefwkserviceimpl/include/resourcemanager/db_adapter.h b/services/distributedhardwarefwkserviceimpl/include/resourcemanager/db_adapter.h index c1f937dc..cc7ff2fb 100644 --- a/services/distributedhardwarefwkserviceimpl/include/resourcemanager/db_adapter.h +++ b/services/distributedhardwarefwkserviceimpl/include/resourcemanager/db_adapter.h @@ -24,9 +24,9 @@ #include #include "distributed_kv_data_manager.h" +#include "kvstore_observer.h" #include "capability_info.h" -#include "capability_info_manager.h" #include "event_sender.h" namespace OHOS { diff --git a/services/distributedhardwarefwkserviceimpl/include/task/offline_task.h b/services/distributedhardwarefwkserviceimpl/include/task/offline_task.h index 18d06c34..cfcd34a4 100644 --- a/services/distributedhardwarefwkserviceimpl/include/task/offline_task.h +++ b/services/distributedhardwarefwkserviceimpl/include/task/offline_task.h @@ -17,7 +17,6 @@ #define OHOS_DISTRIBUTED_HARDWARE_OFFLINE_TASK_H #include -#include #include "task.h" diff --git a/services/distributedhardwarefwkserviceimpl/src/componentmanager/component_disable.cpp b/services/distributedhardwarefwkserviceimpl/src/componentmanager/component_disable.cpp index 4f9f756b..008cec9c 100644 --- a/services/distributedhardwarefwkserviceimpl/src/componentmanager/component_disable.cpp +++ b/services/distributedhardwarefwkserviceimpl/src/componentmanager/component_disable.cpp @@ -15,8 +15,6 @@ #include "component_disable.h" -#include - #include "anonymous_string.h" #include "constants.h" #include "distributed_hardware_errno.h" diff --git a/services/distributedhardwarefwkserviceimpl/src/componentmanager/component_enable.cpp b/services/distributedhardwarefwkserviceimpl/src/componentmanager/component_enable.cpp index d86e590d..051bf009 100644 --- a/services/distributedhardwarefwkserviceimpl/src/componentmanager/component_enable.cpp +++ b/services/distributedhardwarefwkserviceimpl/src/componentmanager/component_enable.cpp @@ -15,8 +15,6 @@ #include "component_enable.h" -#include - #include "anonymous_string.h" #include "constants.h" #include "distributed_hardware_errno.h" diff --git a/services/distributedhardwarefwkserviceimpl/src/resourcemanager/capability_info_manager.cpp b/services/distributedhardwarefwkserviceimpl/src/resourcemanager/capability_info_manager.cpp index d3e6e9d8..bfe9077f 100644 --- a/services/distributedhardwarefwkserviceimpl/src/resourcemanager/capability_info_manager.cpp +++ b/services/distributedhardwarefwkserviceimpl/src/resourcemanager/capability_info_manager.cpp @@ -15,11 +15,6 @@ #include "capability_info_manager.h" -#include -#include -#include -#include - #include "anonymous_string.h" #include "capability_info_event.h" #include "capability_utils.h" @@ -352,6 +347,10 @@ void CapabilityInfoManager::HandleCapabilityAddChange(const std::vectorGetAnonymousKey().c_str()); globalCapInfoMap_[keyString] = capPtr; std::string uuid = DHContext::GetInstance().GetUUIDByDeviceId(capPtr->GetDeviceId()); + if (uuid.empty()) { + DHLOGI("Find uuid failed and never enable"); + continue; + } std::string networkId = DHContext::GetInstance().GetNetworkIdByUUID(uuid); if (networkId.empty()) { DHLOGI("Find network failed and never enable, deviceId: %s", GetAnonyString(uuid).c_str()); diff --git a/services/distributedhardwarefwkserviceimpl/src/resourcemanager/capability_utils.cpp b/services/distributedhardwarefwkserviceimpl/src/resourcemanager/capability_utils.cpp index cfca0b93..c70f713a 100644 --- a/services/distributedhardwarefwkserviceimpl/src/resourcemanager/capability_utils.cpp +++ b/services/distributedhardwarefwkserviceimpl/src/resourcemanager/capability_utils.cpp @@ -15,10 +15,6 @@ #include "capability_utils.h" -#include -#include -#include - #include "nlohmann/json.hpp" #include "capability_info.h" diff --git a/services/distributedhardwarefwkserviceimpl/src/resourcemanager/db_adapter.cpp b/services/distributedhardwarefwkserviceimpl/src/resourcemanager/db_adapter.cpp index a44192bb..02e738e9 100644 --- a/services/distributedhardwarefwkserviceimpl/src/resourcemanager/db_adapter.cpp +++ b/services/distributedhardwarefwkserviceimpl/src/resourcemanager/db_adapter.cpp @@ -15,11 +15,6 @@ #include "db_adapter.h" -#include -#include - -#include "kvstore_observer.h" - #include "anonymous_string.h" #include "capability_info.h" #include "capability_info_manager.h" diff --git a/services/distributedhardwarefwkserviceimpl/src/task/enable_task.cpp b/services/distributedhardwarefwkserviceimpl/src/task/enable_task.cpp index 4c21c324..cd120a76 100644 --- a/services/distributedhardwarefwkserviceimpl/src/task/enable_task.cpp +++ b/services/distributedhardwarefwkserviceimpl/src/task/enable_task.cpp @@ -15,9 +15,6 @@ #include "enable_task.h" -#include -#include - #include "anonymous_string.h" #include "component_manager.h" #include "distributed_hardware_errno.h" diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_disable_task.cpp b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_disable_task.cpp index 35a54724..363facb9 100644 --- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_disable_task.cpp +++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_disable_task.cpp @@ -15,9 +15,6 @@ #include "mock_disable_task.h" -#include -#include - #include "distributed_hardware_errno.h" #include "distributed_hardware_log.h" diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_enable_task.cpp b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_enable_task.cpp index dea92cc5..c7f826e3 100644 --- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_enable_task.cpp +++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_enable_task.cpp @@ -15,9 +15,6 @@ #include "mock_enable_task.h" -#include -#include - #include "distributed_hardware_errno.h" namespace OHOS { diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_offline_task.cpp b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_offline_task.cpp index db577a7f..d587696b 100644 --- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_offline_task.cpp +++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_offline_task.cpp @@ -15,9 +15,6 @@ #include "mock_offline_task.h" -#include -#include - #include "distributed_hardware_log.h" #include "mock_task_factory.h" #include "task_executor.h" diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_online_task.cpp b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_online_task.cpp index 815b00e4..3b2b6b2f 100644 --- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_online_task.cpp +++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_online_task.cpp @@ -15,9 +15,6 @@ #include "mock_online_task.h" -#include -#include - #include "distributed_hardware_log.h" #include "mock_task_factory.h" #include "task_executor.h" diff --git a/utils/src/anonymous_string.cpp b/utils/src/anonymous_string.cpp index 73d95332..68597d7b 100644 --- a/utils/src/anonymous_string.cpp +++ b/utils/src/anonymous_string.cpp @@ -15,9 +15,6 @@ #include "anonymous_string.h" -#include -#include - #include "securec.h" namespace OHOS { @@ -56,8 +53,8 @@ std::string GetAnonyInt32(const int32_t value) std::string nullString(""); return nullString; } - int32_t length = strlen(tempBuffer); - for (int32_t i = 1; i <= length - 1; i++) { + size_t length = strlen(tempBuffer); + for (size_t i = 1; i <= length - 1; i++) { tempBuffer[i] = '*'; } if (length == 0x01) { diff --git a/utils/test/unittest/common/eventbus/event_bus_test.cpp b/utils/test/unittest/common/eventbus/event_bus_test.cpp index 87669619..30d7a813 100644 --- a/utils/test/unittest/common/eventbus/event_bus_test.cpp +++ b/utils/test/unittest/common/eventbus/event_bus_test.cpp @@ -19,6 +19,14 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { +namespace { + FakeObject *g_obj = nullptr; + FakeSender *g_sender = nullptr; + FakeListener *g_listener = nullptr; + std::shared_ptr g_regHandler = nullptr; + EventBus* g_eventBus = nullptr; +} + void EventbusTest::SetUpTestCase(void) { } diff --git a/utils/test/unittest/common/eventbus/event_bus_test.h b/utils/test/unittest/common/eventbus/event_bus_test.h index c57b4c83..110bfbb8 100644 --- a/utils/test/unittest/common/eventbus/event_bus_test.h +++ b/utils/test/unittest/common/eventbus/event_bus_test.h @@ -98,12 +98,6 @@ public: void SetUp(); void TearDown(); }; - -static FakeObject *g_obj = nullptr; -static FakeSender *g_sender = nullptr; -static FakeListener *g_listener = nullptr; -static std::shared_ptr g_regHandler = nullptr; -static EventBus* g_eventBus = nullptr; } } #endif \ No newline at end of file -- Gitee