From 704631ec8f64bba5bcf03a338737541caf3b0085 Mon Sep 17 00:00:00 2001 From: wanghongen Date: Tue, 5 Aug 2025 17:13:24 +0800 Subject: [PATCH] =?UTF-8?q?hdf=5Fcore=E5=91=8A=E8=AD=A6=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wanghongen --- adapter/uhdf2/manager/src/devmgr_query_device.c | 6 ++---- framework/core/host/src/devhost_service.c | 2 +- framework/core/host/src/hdf_device_node.c | 3 +-- framework/core/manager/src/devhost_service_clnt.c | 2 +- framework/core/manager/src/devmgr_service.c | 2 +- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/adapter/uhdf2/manager/src/devmgr_query_device.c b/adapter/uhdf2/manager/src/devmgr_query_device.c index a3738fe0f..619424613 100644 --- a/adapter/uhdf2/manager/src/devmgr_query_device.c +++ b/adapter/uhdf2/manager/src/devmgr_query_device.c @@ -46,18 +46,16 @@ int DevFillQueryDeviceInfo(struct IDevmgrService *inst, struct HdfSBuf *data, st HDF_LOGD("%{public}s, host:%{public}s %{public}d", __func__, hostClnt->hostName, hostClnt->hostId); while (HdfSListIteratorHasNext(&itDeviceInfo)) { deviceInfo = (struct HdfDeviceInfo *)HdfSListIteratorNext(&itDeviceInfo); - HDF_LOGD("%{public}s %{public}s policy:%{public}d status:%{public}d type:%{public}d", __func__, - deviceInfo->svcName, deviceInfo->policy, deviceInfo->status, deviceInfo->deviceType); if ((deviceInfo->policy == SERVICE_POLICY_CAPACITY || deviceInfo->policy == SERVICE_POLICY_PUBLIC) && deviceInfo->status == status) { flag = HdfSbufWriteString(reply, deviceInfo->svcName); if (!flag) { - HDF_LOGE("%{public}s writing string failed %{public}s", __func__, deviceInfo->svcName); + HDF_LOGE("writing string failed"); return HDF_FAILURE; } flag = HdfSbufWriteInt32(reply, deviceInfo->deviceType); if (!flag) { - HDF_LOGE("%{public}s writing int32 failed %{public}d", __func__, deviceInfo->deviceType); + HDF_LOGE("writing int32 failed"); return HDF_FAILURE; } } diff --git a/framework/core/host/src/devhost_service.c b/framework/core/host/src/devhost_service.c index 543835580..d7b5f1a27 100644 --- a/framework/core/host/src/devhost_service.c +++ b/framework/core/host/src/devhost_service.c @@ -86,7 +86,7 @@ int DevHostServiceAddDevice(struct IDevHostService *inst, const struct HdfDevice } driver = driverLoader->GetDriver(deviceInfo->moduleName); if (driver == NULL) { - HDF_LOGE("failed to add device %{public}s, get driver failed", deviceInfo->moduleName); + HDF_LOGE("failed to add device, get driver failed"); ret = HDF_DEV_ERR_NODATA; goto ERROR; } diff --git a/framework/core/host/src/hdf_device_node.c b/framework/core/host/src/hdf_device_node.c index 07d0c4c34..0ef223b2f 100644 --- a/framework/core/host/src/hdf_device_node.c +++ b/framework/core/host/src/hdf_device_node.c @@ -286,8 +286,7 @@ struct HdfDeviceNode *HdfDeviceNodeNewInstance(const struct HdfDeviceInfo *devic #else devNode->deviceObject.property = HcsGetNodeByMatchAttr(HdfGetHcsRootNode(), deviceInfo->deviceMatchAttr); if (devNode->deviceObject.property == NULL) { - HDF_LOGD("node %{public}s property empty, match attr: %{public}s", - deviceInfo->moduleName, deviceInfo->deviceMatchAttr); + HDF_LOGD("node property empty"); } #endif diff --git a/framework/core/manager/src/devhost_service_clnt.c b/framework/core/manager/src/devhost_service_clnt.c index 421cbbd38..8b39d9588 100644 --- a/framework/core/manager/src/devhost_service_clnt.c +++ b/framework/core/manager/src/devhost_service_clnt.c @@ -49,7 +49,7 @@ int DevHostServiceClntInstallDriver(struct DevHostServiceClnt *hostClnt) } ret = devHostSvcIf->AddDevice(devHostSvcIf, deviceInfo); if (ret != HDF_SUCCESS) { - HDF_LOGE("failed to AddDevice %{public}s, ret = %{public}d", deviceInfo->svcName, ret); + HDF_LOGE("failed to AddDevice"); continue; } deviceInfo->status = HDF_SERVICE_USABLE; diff --git a/framework/core/manager/src/devmgr_service.c b/framework/core/manager/src/devmgr_service.c index e2cbcf7a1..5c4583ab4 100644 --- a/framework/core/manager/src/devmgr_service.c +++ b/framework/core/manager/src/devmgr_service.c @@ -213,7 +213,7 @@ int32_t DevmgrServiceLoadLeftDriver(struct DevmgrService *devMgrSvc) if (deviceInfo->preload == DEVICE_PRELOAD_ENABLE_STEP2) { ret = hostClnt->hostService->AddDevice(hostClnt->hostService, deviceInfo); if (ret != HDF_SUCCESS) { - HDF_LOGE("%{public}s:failed to load driver %{public}s", __func__, deviceInfo->moduleName); + HDF_LOGE("failed to load driver"); continue; } deviceInfo->status = HDF_SERVICE_USABLE; -- Gitee