From 6b24e9d0c85966fc17e7a4c0ad3378b70aa83e4b Mon Sep 17 00:00:00 2001 From: puhui Date: Thu, 10 Mar 2022 17:44:31 +0800 Subject: [PATCH] =?UTF-8?q?codex=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: puhui --- .../src/ability/lite/dm_ability_manager.cpp | 4 +- .../ability/standard/dm_ability_manager.cpp | 2 +- .../src/ability/lite/dm_ability_manager.cpp | 2 +- .../ability/standard/dm_ability_manager.cpp | 2 +- .../kits/js/src/native_devicemanager_js.cpp | 80 ++++++++++++++----- .../src/ability/lite/dm_ability_manager.cpp | 2 +- .../ability/standard/dm_ability_manager.cpp | 2 +- .../src/dependency/timer/dm_timer.cpp | 1 - utils/src/dm_anonymous.cpp | 3 +- 9 files changed, 68 insertions(+), 30 deletions(-) diff --git a/ext/mini/services/devicemanagerservice/src/ability/lite/dm_ability_manager.cpp b/ext/mini/services/devicemanagerservice/src/ability/lite/dm_ability_manager.cpp index 3b5885159..b6f9025e6 100644 --- a/ext/mini/services/devicemanagerservice/src/ability/lite/dm_ability_manager.cpp +++ b/ext/mini/services/devicemanagerservice/src/ability/lite/dm_ability_manager.cpp @@ -39,9 +39,9 @@ AbilityStatus DmAbilityManager::StartAbility(AbilityRole role) void DmAbilityManager::waitForTimeout(uint32_t timeout_s) { - struct timespec ts; + struct timespec ts; clock_gettime(CLOCK_REALTIME, &ts); - ts.tv_sec += timeout_s; + ts.tv_sec += (int32_t)timeout_s; sem_timedwait(&mSem_, &ts); } diff --git a/ext/mini/services/devicemanagerservice/src/ability/standard/dm_ability_manager.cpp b/ext/mini/services/devicemanagerservice/src/ability/standard/dm_ability_manager.cpp index 8cf00eccc..472831899 100644 --- a/ext/mini/services/devicemanagerservice/src/ability/standard/dm_ability_manager.cpp +++ b/ext/mini/services/devicemanagerservice/src/ability/standard/dm_ability_manager.cpp @@ -84,7 +84,7 @@ void DmAbilityManager::waitForTimeout(uint32_t timeout_s) { struct timespec ts; clock_gettime(CLOCK_REALTIME, &ts); - ts.tv_sec += timeout_s; + ts.tv_sec += (int32_t)timeout_s; sem_timedwait(&mSem_, &ts); } diff --git a/ext/pin_auth/src/ability/lite/dm_ability_manager.cpp b/ext/pin_auth/src/ability/lite/dm_ability_manager.cpp index 451123305..d58403aee 100644 --- a/ext/pin_auth/src/ability/lite/dm_ability_manager.cpp +++ b/ext/pin_auth/src/ability/lite/dm_ability_manager.cpp @@ -34,7 +34,7 @@ void DmAbilityManager::waitForTimeout(uint32_t timeout_s) { struct timespec ts; clock_gettime(CLOCK_REALTIME, &ts); - ts.tv_sec += timeout_s; + ts.tv_sec += (int32_t)timeout_s; sem_timedwait(&mSem_, &ts); } diff --git a/ext/pin_auth/src/ability/standard/dm_ability_manager.cpp b/ext/pin_auth/src/ability/standard/dm_ability_manager.cpp index b1ea6b992..09d720314 100644 --- a/ext/pin_auth/src/ability/standard/dm_ability_manager.cpp +++ b/ext/pin_auth/src/ability/standard/dm_ability_manager.cpp @@ -49,7 +49,7 @@ AbilityStatus DmAbilityManager::StartAbility(AbilityRole role) AAFwk::AbilityManagerClient::GetInstance()->Connect(); ErrCode result = AAFwk::AbilityManagerClient::GetInstance()->StartAbility(want); if (result != OHOS::ERR_OK) { - LOGE("Start Ability faild"); + LOGE("Start Ability failed"); mStatus_ = ABILITY_STATUS_FAILED; return mStatus_; } diff --git a/interfaces/kits/js/src/native_devicemanager_js.cpp b/interfaces/kits/js/src/native_devicemanager_js.cpp index 172e641b2..c1bf2b6e2 100644 --- a/interfaces/kits/js/src/native_devicemanager_js.cpp +++ b/interfaces/kits/js/src/native_devicemanager_js.cpp @@ -91,11 +91,15 @@ void DmNapiInitCallback::OnRemoteDied() return; } deviceManagerNapi->OnEvent("serviceDie", 0, nullptr); - delete work; + if (work != nullptr) { + delete work; + } }); if (ret != 0) { LOGE("Failed to execute OnRemoteDied work queue"); - delete work; + if (work != nullptr) { + delete work; + } } } @@ -123,11 +127,15 @@ void DmNapiDeviceStateCallback::OnDeviceOnline(const DmDeviceInfo &deviceInfo) return; } deviceManagerNapi->OnDeviceStateChange(DmNapiDevStateChangeAction::ONLINE, callback->deviceInfo_); - delete work; + if (work != nullptr) { + delete work; + } }); if (ret != 0) { LOGE("Failed to execute OnDeviceOnline work queue"); - delete work; + if (work != nullptr) { + delete work; + } } } @@ -155,11 +163,15 @@ void DmNapiDeviceStateCallback::OnDeviceReady(const DmDeviceInfo &deviceInfo) return; } deviceManagerNapi->OnDeviceStateChange(DmNapiDevStateChangeAction::READY, callback->deviceInfo_); - delete work; + if (work != nullptr) { + delete work; + } }); if (ret != 0) { LOGE("Failed to execute OnDeviceReady work queue"); - delete work; + if (work != nullptr) { + delete work; + } } } @@ -187,11 +199,15 @@ void DmNapiDeviceStateCallback::OnDeviceOffline(const DmDeviceInfo &deviceInfo) return; } deviceManagerNapi->OnDeviceStateChange(DmNapiDevStateChangeAction::OFFLINE, callback->deviceInfo_); - delete work; + if (work != nullptr) { + delete work; + } }); if (ret != 0) { LOGE("Failed to execute OnDeviceOffline work queue"); - delete work; + if (work != nullptr) { + delete work; + } } } @@ -219,11 +235,15 @@ void DmNapiDeviceStateCallback::OnDeviceChanged(const DmDeviceInfo &deviceInfo) return; } deviceManagerNapi->OnDeviceStateChange(DmNapiDevStateChangeAction::CHANGE, callback->deviceInfo_); - delete work; + if (work != nullptr) { + delete work; + } }); if (ret != 0) { LOGE("Failed to execute OnDeviceChanged work queue"); - delete work; + if (work != nullptr) { + delete work; + } } } @@ -253,11 +273,15 @@ void DmNapiDiscoveryCallback::OnDeviceFound(uint16_t subscribeId, const DmDevice return; } deviceManagerNapi->OnDeviceFound(callback->subscribeId_, callback->deviceInfo_); - delete work; + if (work != nullptr) { + delete work; + } }); if (ret != 0) { LOGE("Failed to execute OnDeviceFound work queue"); - delete work; + if (work != nullptr) { + delete work; + } } } @@ -288,11 +312,15 @@ void DmNapiDiscoveryCallback::OnDiscoveryFailed(uint16_t subscribeId, int32_t fa return; } deviceManagerNapi->OnDiscoveryFailed(callback->subscribeId_, callback->reason_); - delete work; + if (work != nullptr) { + delete work; + } }); if (ret != 0) { LOGE("Failed to execute OnDiscoveryFailed work queue"); - delete work; + if (work != nullptr) { + delete work; + } } } @@ -346,11 +374,15 @@ void DmNapiAuthenticateCallback::OnAuthResult(const std::string &deviceId, const return; } deviceManagerNapi->OnAuthResult(callback->deviceId_, callback->token_, callback->status_, callback->reason_); - delete work; + if (work != nullptr) { + delete work; + } }); if (ret != 0) { LOGE("Failed to execute OnAuthResult work queue"); - delete work; + if (work != nullptr) { + delete work; + } } } @@ -378,11 +410,15 @@ void DmNapiVerifyAuthCallback::OnVerifyAuthResult(const std::string &deviceId, i return; } deviceManagerNapi->OnVerifyResult(callback->deviceId_, callback->resultCode_, callback->flag_); - delete work; + if (work != nullptr) { + delete work; + } }); if (ret != 0) { LOGE("Failed to execute OnVerifyAuthResult work queue"); - delete work; + if (work != nullptr) { + delete work; + } } } @@ -1047,11 +1083,15 @@ void DmNapiDeviceManagerFaCallback::OnCall(const std::string ¶mJson) return; } deviceManagerNapi->OnDmfaCall(callback->token_); - delete work; + if (work != nullptr) { + delete work; + } }); if (ret != 0) { LOGE("Failed to execute OnCall work queue"); - delete work; + if (work != nullptr) { + delete work; + } } } diff --git a/services/devicemanagerservice/src/ability/lite/dm_ability_manager.cpp b/services/devicemanagerservice/src/ability/lite/dm_ability_manager.cpp index 6d87d130f..fed65776c 100644 --- a/services/devicemanagerservice/src/ability/lite/dm_ability_manager.cpp +++ b/services/devicemanagerservice/src/ability/lite/dm_ability_manager.cpp @@ -36,7 +36,7 @@ void DmAbilityManager::waitForTimeout(uint32_t timeout_s) { struct timespec ts; clock_gettime(CLOCK_REALTIME, &ts); - ts.tv_sec += timeout_s; + ts.tv_sec += (int32_t)timeout_s; sem_timedwait(&mSem_, &ts); } diff --git a/services/devicemanagerservice/src/ability/standard/dm_ability_manager.cpp b/services/devicemanagerservice/src/ability/standard/dm_ability_manager.cpp index ce077df93..a4916043b 100644 --- a/services/devicemanagerservice/src/ability/standard/dm_ability_manager.cpp +++ b/services/devicemanagerservice/src/ability/standard/dm_ability_manager.cpp @@ -62,7 +62,7 @@ void DmAbilityManager::waitForTimeout(uint32_t timeout_s) { struct timespec ts; clock_gettime(CLOCK_REALTIME, &ts); - ts.tv_sec += timeout_s; + ts.tv_sec += (int32_t)timeout_s; sem_timedwait(&mSem_, &ts); } diff --git a/services/devicemanagerservice/src/dependency/timer/dm_timer.cpp b/services/devicemanagerservice/src/dependency/timer/dm_timer.cpp index 9ef388b1c..c4f95b94e 100644 --- a/services/devicemanagerservice/src/dependency/timer/dm_timer.cpp +++ b/services/devicemanagerservice/src/dependency/timer/dm_timer.cpp @@ -82,7 +82,6 @@ void DmTimer::Stop(int32_t code) LOGI("DmTimer is not init"); return; } - LOGI("DmTimer %s Stop code (%d)", mTimerName_.c_str(), code); if (mTimeFd_[1]) { char event = 'S'; if (write(mTimeFd_[1], &event, 1) < 0) { diff --git a/utils/src/dm_anonymous.cpp b/utils/src/dm_anonymous.cpp index 8fbe5b580..299205224 100644 --- a/utils/src/dm_anonymous.cpp +++ b/utils/src/dm_anonymous.cpp @@ -51,8 +51,7 @@ std::string GetAnonyInt32(const int32_t value) tempString[0] = '*'; return tempString; } - - for (int32_t i = 1; i < length - 1; i++) { + for (size_t i = 1; i < length - 1; i++) { tempString[i] = '*'; } return tempString; -- Gitee