diff --git a/model/sensor/driver/common/src/sensor_device_manager.c b/model/sensor/driver/common/src/sensor_device_manager.c index 0e8ab5b71b39ebaf7c81066dd63cb8d092fb8f4c..45d6c7b75f0fda5cfdb15d8871f85869df32717a 100644 --- a/model/sensor/driver/common/src/sensor_device_manager.c +++ b/model/sensor/driver/common/src/sensor_device_manager.c @@ -38,7 +38,7 @@ int32_t AddSensorDevice(const struct SensorDeviceInfo *deviceInfo) DLIST_FOR_EACH_ENTRY(pos, &manager->sensorDevInfoHead, struct SensorDevInfoNode, node) { if ((deviceInfo->sensorInfo.sensorId == pos->devInfo.sensorInfo.sensorId) && (strcmp(deviceInfo->sensorInfo.sensorName, pos->devInfo.sensorInfo.sensorName) == 0)) { - HDF_LOGE("%{public}s: sensor id[%{public}d] had existed", __func__, deviceInfo->sensorInfo.sensorId); + HDF_LOGE("%s: sensor id[%d] had existed", __func__, deviceInfo->sensorInfo.sensorId); return HDF_FAILURE; } } @@ -51,14 +51,14 @@ int32_t AddSensorDevice(const struct SensorDeviceInfo *deviceInfo) } if (memcpy_s(&devInfoNode->devInfo, sizeof(devInfoNode->devInfo), (void *)deviceInfo, sizeof(*deviceInfo)) != EOK) { - HDF_LOGE("%{public}s: copy sensor info failed", __func__); + HDF_LOGE("%s: copy sensor info failed", __func__); OsalMemFree(devInfoNode); (void)OsalMutexUnlock(&manager->mutex); return HDF_FAILURE; } DListInsertTail(&devInfoNode->node, &manager->sensorDevInfoHead); (void)OsalMutexUnlock(&manager->mutex); - HDF_LOGI("%{public}s: register sensor name[%{private}s] success", __func__, deviceInfo->sensorInfo.sensorName); + HDF_LOGI("%s: register sensor name[%s] success", __func__, deviceInfo->sensorInfo.sensorName); return HDF_SUCCESS; } @@ -83,7 +83,7 @@ int32_t DeleteSensorDevice(const struct SensorBasicInfo *sensorBaseInfo) } } (void)OsalMutexUnlock(&manager->mutex); - HDF_LOGE("%{public}s: delete sensor id invalid para", __func__); + HDF_LOGE("%s: delete sensor id invalid para", __func__); return HDF_FAILURE; } diff --git a/test/unittest/sensor/hdf_sensor_test.c b/test/unittest/sensor/hdf_sensor_test.c index 343da23290f2ab860a5039f6d424391c0c71e7fc..ce89c9eb3dcb9e0db9ed96cffbe9178214b1ae89 100644 --- a/test/unittest/sensor/hdf_sensor_test.c +++ b/test/unittest/sensor/hdf_sensor_test.c @@ -96,19 +96,19 @@ static int32_t SensorEnableTest(void) struct SensorTestDrvData *drvData = GetSensorTestDrvData(); if (drvData->enable) { - HDF_LOGE("%{public}s: sensor test had enable", __func__); + HDF_LOGE("%s: sensor test had enable", __func__); return HDF_SUCCESS; } ret = OsalTimerCreate(&drvData->timer, SENSOR_TIMER_MIN_TIME, SensorTestTimerEntry, (uintptr_t)drvData); if (ret != HDF_SUCCESS) { - HDF_LOGE("%{public}s: sensor test create timer failed[%{public}d]", __func__, ret); + HDF_LOGE("%s: sensor test create timer failed[%d]", __func__, ret); return ret; } ret = OsalTimerStartLoop(&drvData->timer); if (ret != HDF_SUCCESS) { - HDF_LOGE("%{public}s: sensor test start timer failed[%{public}d]", __func__, ret); + HDF_LOGE("%s: sensor test start timer failed[%d]", __func__, ret); return ret; } drvData->enable = true;