From 609d31dd5fe2e989a09ec2ae3110f48ed2fe212e Mon Sep 17 00:00:00 2001 From: kevin Date: Wed, 30 Jun 2021 17:31:01 +0800 Subject: [PATCH] delete log public Signed-off-by: kevin Change-Id: Id7d0e973e95777a9e55cfef530693916fee7b3ac --- model/misc/vibrator/driver/src/vibrator_driver.c | 2 +- model/misc/vibrator/driver/src/vibrator_haptic.c | 14 +++++++------- .../driver/common/src/sensor_device_manager.c | 8 ++++---- test/unittest/sensor/hdf_sensor_test.c | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/model/misc/vibrator/driver/src/vibrator_driver.c b/model/misc/vibrator/driver/src/vibrator_driver.c index dc78c3529..9d47a1be9 100644 --- a/model/misc/vibrator/driver/src/vibrator_driver.c +++ b/model/misc/vibrator/driver/src/vibrator_driver.c @@ -96,7 +96,7 @@ static void VibratorWorkEntry(void *para) } if (ret != HDF_SUCCESS) { - HDF_LOGE("%s: add vibrator work fail! device state[%d{public}]!", __func__, drvData->state); + HDF_LOGE("%s: add vibrator work fail! device state[%d]!", __func__, drvData->state); } } diff --git a/model/misc/vibrator/driver/src/vibrator_haptic.c b/model/misc/vibrator/driver/src/vibrator_haptic.c index c86dba083..740162196 100644 --- a/model/misc/vibrator/driver/src/vibrator_haptic.c +++ b/model/misc/vibrator/driver/src/vibrator_haptic.c @@ -171,7 +171,7 @@ static uint32_t ProcessHapticEffect(struct VibratorHapticData *hapticData) CHECK_VIBRATOR_NULL_PTR_RETURN_VALUE(hapticData, HDF_FAILURE); if ((hapticData->currentSeqIndex < 0) || ((hapticData->currentSeqIndex + 1) >= hapticData->seqCount)) { - HDF_LOGE("%{public}s: seq index invalid para", __func__); + HDF_LOGE("%{s: seq index invalid para", __func__); return 0; } @@ -181,7 +181,7 @@ static uint32_t ProcessHapticEffect(struct VibratorHapticData *hapticData) hapticData->currentSeqIndex++; if (hapticData->currentSeqIndex >= hapticData->seqCount) { - HDF_LOGE("%{public}s: seq index exceed max value", __func__); + HDF_LOGE("%s: seq index exceed max value", __func__); return 0; } @@ -201,24 +201,24 @@ void HapticTimerEntry(uintptr_t para) if (hapticData->effectType == VIBRATOR_TYPE_TIME) { duration = ProcessHapticTime(hapticData); - HDF_LOGE("%{public}s:ProcessHapticTime duration[%{public}d]", __func__, duration); + HDF_LOGE("%s:ProcessHapticTime duration[%d]", __func__, duration); } if (hapticData->effectType == VIBRATOR_TYPE_EFFECT) { duration = ProcessHapticEffect(hapticData); - HDF_LOGE("%{public}s:ProcessHapticEffect duration[%{public}d]", __func__, duration); + HDF_LOGE("%s:ProcessHapticEffect duration[%d]", __func__, duration); } duration = ((duration > 0) && (duration < VIBRATOR_MIN_WAIT_TIME)) ? VIBRATOR_MIN_WAIT_TIME : duration; if ((duration > 0) && (OsalTimerSetTimeout(&hapticData->timer, duration) == HDF_SUCCESS)) { - HDF_LOGD("%{public}s: modify haptic timer duration[%{public}d]", __func__, duration); + HDF_LOGD("%s: modify haptic timer duration[%d]", __func__, duration); return; } if (hapticData->timer.realTimer != NULL) { ret = OsalTimerDelete(&hapticData->timer); if (ret != HDF_SUCCESS) { - HDF_LOGE("%{public}s: delete haptic timer fail!", __func__); + HDF_LOGE("%s: delete haptic timer fail!", __func__); } } @@ -281,7 +281,7 @@ int32_t StartHaptic(struct VibratorEffectCfg *effectCfg) CHECK_VIBRATOR_NULL_PTR_RETURN_VALUE(hapticData, HDF_FAILURE); if ((effectCfg->cfgMode == VIBRATOR_MODE_PRESET) && (!hapticData->supportHaptic)) { - HDF_LOGE("%{public}s: vibrator no support haptic!", __func__); + HDF_LOGE("%s: vibrator no support haptic!", __func__); return HDF_ERR_NOT_SUPPORT; } diff --git a/model/sensor/driver/common/src/sensor_device_manager.c b/model/sensor/driver/common/src/sensor_device_manager.c index 0e8ab5b71..45d6c7b75 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 343da2329..ce89c9eb3 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; -- Gitee