From 218e1083efed596685c639c0b0d27321e7c4b43a Mon Sep 17 00:00:00 2001 From: li-yaoyao777 Date: Tue, 29 Mar 2022 15:29:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B0=86NULL=E6=94=B9=E4=B8=BAnullptr?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-yaoyao777 --- interfaces/native/vibrator/src/vibrator_agent.cpp | 2 +- interfaces/plugin/vibrator/src/vibrator_js.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interfaces/native/vibrator/src/vibrator_agent.cpp b/interfaces/native/vibrator/src/vibrator_agent.cpp index c4bbbb0..bc1c545 100644 --- a/interfaces/native/vibrator/src/vibrator_agent.cpp +++ b/interfaces/native/vibrator/src/vibrator_agent.cpp @@ -38,7 +38,7 @@ int32_t DisableLooping() int32_t StartVibrator(const char *effectId) { - if (effectId == NULL) { + if (effectId == nullptr) { HiLog::Error(LABEL, "%{public}s effectId is null", __func__); return OHOS::Sensors::ERROR; } diff --git a/interfaces/plugin/vibrator/src/vibrator_js.cpp b/interfaces/plugin/vibrator/src/vibrator_js.cpp index 65eb12e..056bede 100644 --- a/interfaces/plugin/vibrator/src/vibrator_js.cpp +++ b/interfaces/plugin/vibrator/src/vibrator_js.cpp @@ -245,7 +245,7 @@ static napi_value Init(napi_env env, napi_value exports) static napi_module _module = { .nm_version = 1, .nm_flags = 0, - .nm_filename = NULL, + .nm_filename = nullptr, .nm_register_func = Init, .nm_modname = "vibrator", .nm_priv = ((void *)0), -- Gitee From fde35c855e1deaff33f83a096408c26cd5057e2d Mon Sep 17 00:00:00 2001 From: li-yaoyao777 Date: Tue, 29 Mar 2022 15:39:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B0=86char=20*=E6=94=B9=E4=B8=BAstring?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-yaoyao777 --- .../interface/include/i_vibrator_hdi_connection.h | 2 +- services/miscdevice_service/src/miscdevice_service.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/miscdevice_service/hdi_connection/interface/include/i_vibrator_hdi_connection.h b/services/miscdevice_service/hdi_connection/interface/include/i_vibrator_hdi_connection.h index aca818e..8df4f7e 100644 --- a/services/miscdevice_service/hdi_connection/interface/include/i_vibrator_hdi_connection.h +++ b/services/miscdevice_service/hdi_connection/interface/include/i_vibrator_hdi_connection.h @@ -35,7 +35,7 @@ public: virtual int32_t StartOnce(uint32_t duration) = 0; - virtual int32_t Start(const char *effectType) = 0; + virtual int32_t Start(const string effectType) = 0; virtual int32_t Stop(VibratorStopMode mode) = 0; diff --git a/services/miscdevice_service/src/miscdevice_service.cpp b/services/miscdevice_service/src/miscdevice_service.cpp index a6e6428..12ad70d 100644 --- a/services/miscdevice_service/src/miscdevice_service.cpp +++ b/services/miscdevice_service/src/miscdevice_service.cpp @@ -230,7 +230,7 @@ int32_t MiscdeviceService::PlayVibratorEffect(int32_t vibratorId, const std::str } if (!isLooping) { vibratorEffectMap_[vibratorId] = effect; - const char *effectType = (char *)effect.data(); + const char *effectType = (string)effect.data(); return vibratorHdiConnection_.Start(effectType); } std::unordered_map::iterator iter = hapticRingMap_.find(effect); -- Gitee From 319168ea14a839cba03596f541c8f448844c0a5b Mon Sep 17 00:00:00 2001 From: li-yaoyao777 Date: Tue, 29 Mar 2022 16:51:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A9=AC=E8=BE=BE?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-yaoyao777 --- .../interface/include/i_vibrator_hdi_connection.h | 2 +- services/miscdevice_service/src/miscdevice_service.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/miscdevice_service/hdi_connection/interface/include/i_vibrator_hdi_connection.h b/services/miscdevice_service/hdi_connection/interface/include/i_vibrator_hdi_connection.h index 8df4f7e..aca818e 100644 --- a/services/miscdevice_service/hdi_connection/interface/include/i_vibrator_hdi_connection.h +++ b/services/miscdevice_service/hdi_connection/interface/include/i_vibrator_hdi_connection.h @@ -35,7 +35,7 @@ public: virtual int32_t StartOnce(uint32_t duration) = 0; - virtual int32_t Start(const string effectType) = 0; + virtual int32_t Start(const char *effectType) = 0; virtual int32_t Stop(VibratorStopMode mode) = 0; diff --git a/services/miscdevice_service/src/miscdevice_service.cpp b/services/miscdevice_service/src/miscdevice_service.cpp index 12ad70d..a6e6428 100644 --- a/services/miscdevice_service/src/miscdevice_service.cpp +++ b/services/miscdevice_service/src/miscdevice_service.cpp @@ -230,7 +230,7 @@ int32_t MiscdeviceService::PlayVibratorEffect(int32_t vibratorId, const std::str } if (!isLooping) { vibratorEffectMap_[vibratorId] = effect; - const char *effectType = (string)effect.data(); + const char *effectType = (char *)effect.data(); return vibratorHdiConnection_.Start(effectType); } std::unordered_map::iterator iter = hapticRingMap_.find(effect); -- Gitee