From 76e9b5dc654f2b1cbfda500b857cf17990cf43ab Mon Sep 17 00:00:00 2001 From: Gymee Date: Tue, 21 Dec 2021 20:10:11 +0800 Subject: [PATCH] code tweaks Signed-off-by: Gymee Change-Id: I621d656b3084cc3351e9c7b2e97d95abf893f129 --- interfaces/native/vibrator/src/vibrator_agent.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) mode change 100755 => 100644 interfaces/native/vibrator/src/vibrator_agent.cpp diff --git a/interfaces/native/vibrator/src/vibrator_agent.cpp b/interfaces/native/vibrator/src/vibrator_agent.cpp old mode 100755 new mode 100644 index a491e48..0188420 --- a/interfaces/native/vibrator/src/vibrator_agent.cpp +++ b/interfaces/native/vibrator/src/vibrator_agent.cpp @@ -38,11 +38,11 @@ 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; } - bool isLooping = (g_loopingFlag == 1) ? true : false; + bool isLooping = g_loopingFlag == 1; auto &client = VibratorServiceClient::GetInstance(); int32_t ret = client.Vibrate(DEFAULT_VIBRATOR_ID, effectId, isLooping); if (ret != OHOS::ERR_OK) { @@ -69,6 +69,11 @@ int32_t StartVibratorOnce(uint32_t duration) int32_t StopVibrator(const char *mode) { + if (mode == nullptr) { + HiLog::Error(LABEL, "%{public}s mode is null", __func__); + return OHOS::Sensors::ERROR; + } + if (strcmp(mode, "time") != 0 && strcmp(mode, "preset") != 0) { HiLog::Error(LABEL, "%{public}s mode is invalid, mode is %{public}s", __func__, mode); return OHOS::Sensors::ERROR; @@ -80,4 +85,4 @@ int32_t StopVibrator(const char *mode) return OHOS::Sensors::ERROR; } return OHOS::Sensors::SUCCESS; -} \ No newline at end of file +} -- Gitee