From 0b331dff98c10005b850557d7e87297ab8f15a05 Mon Sep 17 00:00:00 2001 From: huyx Date: Tue, 2 Apr 2024 19:53:23 +0800 Subject: [PATCH] codecheck clean Signed-off-by: huyx --- .../stub_collector/stub_collector_test.cpp | 24 +++++++++---------- .../utils/src/hcs_parser/hcs_dm_parser.c | 10 ++++---- .../adapter/syscall/src/hdf_syscall_adapter.c | 5 ++++ framework/tools/hdf_dev_eco_tool/hdf_utils.py | 2 +- .../tools/hdi-gen/util/string_builder.cpp | 18 +++++++++++--- .../idl-gen/testcase/test_idl_generator.py | 8 +++---- 6 files changed, 42 insertions(+), 25 deletions(-) diff --git a/adapter/uhdf2/hdi/test/stub_collector/stub_collector_test.cpp b/adapter/uhdf2/hdi/test/stub_collector/stub_collector_test.cpp index 5cb049a6f..79d35cf4f 100644 --- a/adapter/uhdf2/hdi/test/stub_collector/stub_collector_test.cpp +++ b/adapter/uhdf2/hdi/test/stub_collector/stub_collector_test.cpp @@ -35,7 +35,7 @@ namespace OHOS { } - const char *ifdesc = "test stub constructor"; + const char *IFDESC = "test stub constructor"; struct StubConstructor testConstructor = { .constructor = TestConstruct, @@ -54,13 +54,13 @@ public: HWTEST_F(StubCollectorTest, StubCollectorTest001, TestSize.Level1) { StubConstructorRegister(nullptr, nullptr); - StubConstructorRegister(ifdesc, nullptr); - StubConstructorRegister(ifdesc, &testConstructor); - StubConstructorRegister(ifdesc, &testConstructor); + StubConstructorRegister(IFDESC, nullptr); + StubConstructorRegister(IFDESC, &testConstructor); + StubConstructorRegister(IFDESC, &testConstructor); - StubConstructorUnregister(ifdesc, &testConstructor); + StubConstructorUnregister(IFDESC, &testConstructor); StubConstructorUnregister(nullptr, nullptr); - StubConstructorUnregister(ifdesc, nullptr); + StubConstructorUnregister(IFDESC, nullptr); struct HdfRemoteService **remote = StubCollectorGetOrNewObject(nullptr, nullptr); ASSERT_EQ(remote, nullptr); @@ -70,7 +70,7 @@ HWTEST_F(StubCollectorTest, StubCollectorTest002, TestSize.Level1) { struct TestService *service = (struct TestService *)OsalMemCalloc(sizeof(struct TestService)); ASSERT_NE(service, nullptr); - struct HdfRemoteService **remote = StubCollectorGetOrNewObject(ifdesc, service); + struct HdfRemoteService **remote = StubCollectorGetOrNewObject(IFDESC, service); ASSERT_EQ(remote, nullptr); OsalMemFree(service); } @@ -99,21 +99,21 @@ HWTEST_F(StubCollectorTest, StubCollectorTest004, TestSize.Level1) { struct TestService *service = (struct TestService *)OsalMemCalloc(sizeof(struct TestService)); ASSERT_NE(service, nullptr); - StubConstructorRegister(ifdesc, &testConstructor); - struct HdfRemoteService **remote = StubCollectorGetOrNewObject(ifdesc, service); + StubConstructorRegister(IFDESC, &testConstructor); + struct HdfRemoteService **remote = StubCollectorGetOrNewObject(IFDESC, service); ASSERT_EQ(remote, nullptr); - StubConstructorUnregister(ifdesc, &testConstructor); + StubConstructorUnregister(IFDESC, &testConstructor); OsalMemFree(service); } HWTEST_F(StubCollectorTest, StubCollectorTest005, TestSize.Level1) { StubCollectorRemoveObject(nullptr, nullptr); - StubCollectorRemoveObject(ifdesc, nullptr); + StubCollectorRemoveObject(IFDESC, nullptr); struct TestService *service = (struct TestService *)OsalMemCalloc(sizeof(struct TestService)); ASSERT_NE(service, nullptr); - StubCollectorRemoveObject(ifdesc, service); + StubCollectorRemoveObject(IFDESC, service); OsalMemFree(service); } diff --git a/adapter/uhdf2/utils/src/hcs_parser/hcs_dm_parser.c b/adapter/uhdf2/utils/src/hcs_parser/hcs_dm_parser.c index 3ceda5892..f5ec17e5a 100644 --- a/adapter/uhdf2/utils/src/hcs_parser/hcs_dm_parser.c +++ b/adapter/uhdf2/utils/src/hcs_parser/hcs_dm_parser.c @@ -24,7 +24,7 @@ #define HDF_LOG_TAG hcs_dm_parser static char *g_hcsBlob = NULL; static struct DeviceResourceNode *g_hcsTreeRoot = NULL; -static const char *g_hcsBlobPath = NULL; +static const char *HCS_BLOB_PATH = NULL; static pthread_mutex_t g_getDmRootMutex = PTHREAD_MUTEX_INITIALIZER; void ReleaseHcsTree(void) @@ -37,17 +37,17 @@ void ReleaseHcsTree(void) void SetHcsBlobPath(const char *path) { - if (g_hcsBlobPath != NULL) { - OsalMemFree((void *)g_hcsBlobPath); + if (HCS_BLOB_PATH != NULL) { + OsalMemFree((void *)HCS_BLOB_PATH); } - g_hcsBlobPath = strdup(path); + HCS_BLOB_PATH = strdup(path); } static bool CreateHcsToTree(void) { bool ret = true; do { - uint32_t length = OpenHcsBlobFile(g_hcsBlobPath, &g_hcsBlob); + uint32_t length = OpenHcsBlobFile(HCS_BLOB_PATH, &g_hcsBlob); if (length == 0) { ret = false; break; diff --git a/framework/core/adapter/syscall/src/hdf_syscall_adapter.c b/framework/core/adapter/syscall/src/hdf_syscall_adapter.c index b238dfe78..53feb92c1 100644 --- a/framework/core/adapter/syscall/src/hdf_syscall_adapter.c +++ b/framework/core/adapter/syscall/src/hdf_syscall_adapter.c @@ -1069,6 +1069,11 @@ int32_t HdfIoServiceGroupAddService(struct HdfIoServiceGroup *group, struct HdfI struct HdfSyscallAdapter *adapter = CONTAINER_OF(service, struct HdfSyscallAdapter, super); struct HdfSyscallAdapterGroup *adapterGroup = CONTAINER_OF(group, struct HdfSyscallAdapterGroup, serviceGroup); + if (adapterGroup == NULL || adapter == NULL) { + HDF_LOGE("adapterGroup is NULL"); + return HDF_FAILURE; + } + if (adapter->group != NULL) { HDF_LOGE("service already in group"); return HDF_ERR_DEVICE_BUSY; diff --git a/framework/tools/hdf_dev_eco_tool/hdf_utils.py b/framework/tools/hdf_dev_eco_tool/hdf_utils.py index 74b69dad7..83638e71d 100644 --- a/framework/tools/hdf_dev_eco_tool/hdf_utils.py +++ b/framework/tools/hdf_dev_eco_tool/hdf_utils.py @@ -281,7 +281,7 @@ def get_drv_include_dir(root, module, driver): return os.path.join(get_drv_dir(root, module, driver), 'include') -def get_vendor_kconfig_path(root, kernel): +def get_vendor_kconfig_path(root, kernel): hdf_dir = get_vendor_hdf_dir_adapter(root, kernel) return os.path.join(hdf_dir, 'Kconfig') diff --git a/framework/tools/hdi-gen/util/string_builder.cpp b/framework/tools/hdi-gen/util/string_builder.cpp index 0221639b0..858a55c94 100644 --- a/framework/tools/hdi-gen/util/string_builder.cpp +++ b/framework/tools/hdi-gen/util/string_builder.cpp @@ -51,7 +51,11 @@ StringBuilder &StringBuilder::Append(const char *string) } } - (void)memcpy_s(buffer_ + position_, capacity_ - position_, string, len); + int ret = memcpy_s(buffer_ + position_, capacity_ - position_, string, len); + if (ret != 0) { + Logger::E(TAG, "memcpy_s error ret = %d!", ret); + return *this; + } position_ += len; return *this; } @@ -69,7 +73,11 @@ StringBuilder &StringBuilder::Append(const std::string &string) } } - (void)memcpy_s(buffer_ + position_, capacity_ - position_, string.c_str(), len); + int ret = memcpy_s(buffer_ + position_, capacity_ - position_, string.c_str(), len); + if (ret != 0) { + Logger::E(TAG, "memcpy_s error ret = %d!", ret); + return *this; + } position_ += len; return *this; } @@ -137,7 +145,11 @@ bool StringBuilder::Grow(size_t size) } if (buffer_ != nullptr) { - (void)memcpy_s(newBuffer, newSize, buffer_, capacity_); + int ret = memcpy_s(newBuffer, newSize, buffer_, capacity_); + if (ret != 0) { + Logger::E(TAG, "memcpy_s error ret = %d!", ret); + return false; + } free(buffer_); } buffer_ = newBuffer; diff --git a/framework/tools/idl-gen/testcase/test_idl_generator.py b/framework/tools/idl-gen/testcase/test_idl_generator.py index f8c503bde..684b56211 100644 --- a/framework/tools/idl-gen/testcase/test_idl_generator.py +++ b/framework/tools/idl-gen/testcase/test_idl_generator.py @@ -29,15 +29,15 @@ class IDLGeneratorTestCase(unittest.TestCase): generator._idl = "" generator._install_package(".\\h\\audio\\test") - self.assertEqual("".join(generator._idl), "package h.audio.test;\n\n") + self.assertEqual("".join(generator._idl), "package h.audio.test;\n\n") generator._idl = "" generator._install_package("C:\\h\\audio\\test") - self.assertEqual("".join(generator._idl), "package h.audio.test;\n\n") + self.assertEqual("".join(generator._idl), "package h.audio.test;\n\n") generator._idl = "" generator._install_package("./h/audio/test") - self.assertEqual("".join(generator._idl), "package h.audio.test;\n\n") + self.assertEqual("".join(generator._idl), "package h.audio.test;\n\n") def test_install_import_interface(self): generator = IDLGenerator() @@ -279,7 +279,7 @@ class IDLGeneratorTestCase(unittest.TestCase): generator._key_list["InputController"] = "struct" generator._key_list["InputControllerDesc"] = "struct" generator._install_interface(parser._header_dict.get("interface")[0]) - self.assertEqual("".join(generator._idl), "interface InputController {\n" + self.assertEqual("".join(generator._idl), "interface InputController {\n" " RunExtraCommand([in] unsigned int devIndex,[out] unsigned int cmd);\n" " RunExtra([in] struct InputControllerDesc desc);\n" "}\n") -- Gitee