diff --git a/frameworks/ability_lite/example/entry/src/main/cpp/main_ability_slice.cpp b/frameworks/ability_lite/example/entry/src/main/cpp/main_ability_slice.cpp index 4fd4531efcd164528d11d142a0d705187d7cab58..9ed781172fa03dca92dbaa931d4503d81c02e714 100644 --- a/frameworks/ability_lite/example/entry/src/main/cpp/main_ability_slice.cpp +++ b/frameworks/ability_lite/example/entry/src/main/cpp/main_ability_slice.cpp @@ -37,9 +37,7 @@ constexpr static uint8_t FONT_ID = 10; int32_t IpcMsgHandler(int funcId, ElementName *elementName, SvcIdentity *serviceSid, void *storeArg) { - printf("IpcMsgHandler, funcId is %d, serviceSid is %p\n", funcId, serviceSid); - printf("elementName is %s, %s\n", elementName->bundleName, elementName->abilityName); - if (serviceSid == nullptr) { + if (!serviceSid) { return 0; } printf("This is MainAbilitySlice\n"); diff --git a/frameworks/ability_lite/example/entry/src/main/cpp/root_view_helper.cpp b/frameworks/ability_lite/example/entry/src/main/cpp/root_view_helper.cpp index 66ab79038645de623347984e72709f978a605924..98dca0b67228330022b206a04d6a422738f3d6fa 100644 --- a/frameworks/ability_lite/example/entry/src/main/cpp/root_view_helper.cpp +++ b/frameworks/ability_lite/example/entry/src/main/cpp/root_view_helper.cpp @@ -19,7 +19,7 @@ namespace OHOS { void DeleteViewChildren(UIView *view) { - if (view == nullptr) { + if (!view) { return; } while (view != nullptr) { diff --git a/frameworks/ability_lite/src/ability.cpp b/frameworks/ability_lite/src/ability.cpp index 2d17c4dc8a076c33c4815df899e945a2aa3e9841..2492e4e0596ed7d83502fe3fe9f5ffe165800854 100755 --- a/frameworks/ability_lite/src/ability.cpp +++ b/frameworks/ability_lite/src/ability.cpp @@ -120,7 +120,7 @@ const SvcIdentity *Ability::OnConnect(const Want &want) { HILOG_INFO(HILOG_MODULE_APP, "Ability Connect"); sid_ = static_cast(AdapterMalloc(sizeof(SvcIdentity))); - if (sid_ == nullptr) { + if (!sid_) { HILOG_ERROR(HILOG_MODULE_APP, "malloc memory error, sid_ is null"); return nullptr; } @@ -147,7 +147,7 @@ void Ability::OnDisconnect(const Want &want) #ifdef ABILITY_WINDOW_SUPPORT void Ability::SetMainRoute(const std::string &entry) { - if (abilitySliceManager_ == nullptr) { + if (!abilitySliceManager_) { HILOG_ERROR(HILOG_MODULE_APP, "AbilitySliceManager is null, fail to set main route"); exit(-1); } @@ -157,7 +157,7 @@ void Ability::SetMainRoute(const std::string &entry) void Ability::SetUIContent(RootView *rootView) { - if (abilityWindow_ == nullptr) { + if (!abilityWindow_) { HILOG_ERROR(HILOG_MODULE_APP, "AbilityWindow is null, fail to SetUIContent"); exit(-1); } @@ -218,12 +218,12 @@ std::string Ability::GetDumpInfo() const #ifdef ABILITY_WINDOW_SUPPORT void Ability::DeliverAbilityLifecycle(Action action, const Want *want) { - if (abilitySliceManager_ == nullptr) { + if (!abilitySliceManager_) { HILOG_WARN(HILOG_MODULE_APP, "AbilitySliceManager is null, no need to dispatch lifecycle state change"); return; } - if ((action == START || action == ACTIVE) && want == nullptr) { + if ((action == START || action == ACTIVE) && !want) { HILOG_ERROR(HILOG_MODULE_APP, "want is null"); return; } @@ -254,7 +254,7 @@ void Ability::DeliverAbilityLifecycle(Action action, const Want *want) int32_t Ability::MsgHandleInner(const IpcContext* context, void *ipcMsg, IpcIo *data, void *arg) { auto ability = static_cast(arg); - if (ability == nullptr) { + if (!ability) { HILOG_INFO(HILOG_MODULE_APP, "handle message error, ability is null"); FreeBuffer(nullptr, ipcMsg); return LITEIPC_EINVAL; diff --git a/frameworks/ability_lite/src/ability_main.cpp b/frameworks/ability_lite/src/ability_main.cpp index 63aa8fa3180d1a63f8233bcc3ae6e498fbe1243e..63d2fae27e698e238eb3507f62e6fff2708aeb29 100644 --- a/frameworks/ability_lite/src/ability_main.cpp +++ b/frameworks/ability_lite/src/ability_main.cpp @@ -28,7 +28,7 @@ namespace { int AbilityMain(const char *token) { - if (token == nullptr) { + if (!token) { return -1; } @@ -37,7 +37,7 @@ int AbilityMain(const char *token) errno = 0; uint64_t tokenId = std::strtoull(token, &endPtr, HEX); if ((errno == ERANGE && tokenId == ULLONG_MAX) || (errno != 0 && tokenId == 0) || - endPtr == nullptr || *endPtr != '\0') { + !endPtr || *endPtr != '\0') { HILOG_ERROR(HILOG_MODULE_APP, "token is invalid"); return -1; } diff --git a/frameworks/ability_lite/src/ability_scheduler.cpp b/frameworks/ability_lite/src/ability_scheduler.cpp index c273e87f5deaf85d2195f1d2f4eafb0b8d5e1eca..593946e1fa37c3f40043fdeaf773262ed500d1ea 100644 --- a/frameworks/ability_lite/src/ability_scheduler.cpp +++ b/frameworks/ability_lite/src/ability_scheduler.cpp @@ -33,13 +33,13 @@ AbilityScheduler::AbilityScheduler(AbilityEventHandler &eventHandler, Scheduler int32_t AbilityScheduler::AmsCallback(const IpcContext* context, void *ipcMsg, IpcIo *data, void *arg) { - if (ipcMsg == nullptr) { + if (!ipcMsg) { HILOG_ERROR(HILOG_MODULE_APP, "ams call back error, ipcMsg is null"); return PARAM_NULL_ERROR; } auto scheduler = static_cast(arg); - if (scheduler == nullptr) { + if (!scheduler) { HILOG_ERROR(HILOG_MODULE_APP, "ams call back error, scheduler is null"); // if you need to send reply to the client, please use SendReply method ClearIpcMsg(ipcMsg); @@ -55,7 +55,7 @@ int32_t AbilityScheduler::AmsCallback(const IpcContext* context, void *ipcMsg, I char *bundleName = reinterpret_cast(IpcIoPopString(data, nullptr)); char *srcPath = reinterpret_cast(IpcIoPopString(data, nullptr)); char *dataPath = reinterpret_cast(IpcIoPopString(data, nullptr)); - if ((bundleName == nullptr) || (srcPath == nullptr) || (dataPath == nullptr)) { + if ((!bundleName) || (!srcPath) || (!dataPath)) { HILOG_ERROR(HILOG_MODULE_APP, "ams call back error, bundleName, srcPath or dataPath is null"); ClearIpcMsg(ipcMsg); return PARAM_NULL_ERROR; @@ -185,7 +185,7 @@ void AbilityScheduler::PerformAppExit() void AbilityScheduler::PerformDumpAbility(const Want &want, uint64_t token) { #ifdef __LINUX__ - if (want.sid == nullptr) { + if (!want.sid) { HILOG_ERROR(HILOG_MODULE_APP, "svcId is invalid when dump ability"); return; } @@ -200,7 +200,7 @@ void AbilityScheduler::PerformDumpAbility(const Want &want, uint64_t token) void AbilityScheduler::ClearIpcMsg(void *ipcMsg) { - if (ipcMsg == nullptr) { + if (!ipcMsg) { return; } uint32_t flag = 0; diff --git a/frameworks/ability_lite/src/ability_slice.cpp b/frameworks/ability_lite/src/ability_slice.cpp index 416d3e11128e1557a43ac7901e629b291ae06b84..7092ba9ba24ea9e5c6ff74502c026551670e6268 100644 --- a/frameworks/ability_lite/src/ability_slice.cpp +++ b/frameworks/ability_lite/src/ability_slice.cpp @@ -32,7 +32,7 @@ void AbilitySlice::Init(AbilitySliceManager &abilitySliceManager) void AbilitySlice::Present(AbilitySlice &abilitySlice, const Want &want) { - if (abilitySliceManager_ == nullptr) { + if (!abilitySliceManager_) { HILOG_ERROR(HILOG_MODULE_APP, "AbilitySlice Present failed"); return; } @@ -41,7 +41,7 @@ void AbilitySlice::Present(AbilitySlice &abilitySlice, const Want &want) void AbilitySlice::Terminate() { - if (abilitySliceManager_ == nullptr) { + if (!abilitySliceManager_) { HILOG_ERROR(HILOG_MODULE_APP, "AbilitySlice Terminate failed"); return; } @@ -50,7 +50,7 @@ void AbilitySlice::Terminate() void AbilitySlice::SetUIContent(RootView *rootView) { - if (abilitySliceManager_ == nullptr) { + if (!abilitySliceManager_) { HILOG_ERROR(HILOG_MODULE_APP, "AbilitySlice SetUIContent failed"); return; } diff --git a/frameworks/ability_lite/src/ability_slice_scheduler.cpp b/frameworks/ability_lite/src/ability_slice_scheduler.cpp index 8952a9bd9f2e6e0dcd98dc57ac300a9cb39b1035..7b235c5d0fb4bd5b39fded462bb68e61d4eabab9 100644 --- a/frameworks/ability_lite/src/ability_slice_scheduler.cpp +++ b/frameworks/ability_lite/src/ability_slice_scheduler.cpp @@ -39,9 +39,9 @@ AbilitySliceScheduler::~AbilitySliceScheduler() void AbilitySliceScheduler::HandleStartAbilitySlice(const Want &want) { - if (topAbilitySlice_ == nullptr) { + if (!topAbilitySlice_) { topAbilitySlice_ = GetTargetAbilitySlice(); - if (topAbilitySlice_ == nullptr) { + if (!topAbilitySlice_) { HILOG_ERROR(HILOG_MODULE_APP, "Cannot get slice [%{public}s]", abilitySliceRoute_->GetMainRoute().c_str()); return; } @@ -53,7 +53,7 @@ void AbilitySliceScheduler::HandleStartAbilitySlice(const Want &want) void AbilitySliceScheduler::HandleInactiveAbilitySlice() { - if (topAbilitySlice_ == nullptr) { + if (!topAbilitySlice_) { return; } @@ -62,7 +62,7 @@ void AbilitySliceScheduler::HandleInactiveAbilitySlice() void AbilitySliceScheduler::HandleActiveAbilitySlice(const Want &want) { - if (topAbilitySlice_ == nullptr) { + if (!topAbilitySlice_) { HILOG_ERROR(HILOG_MODULE_APP, "top ability slice is null, active slice error"); return; } @@ -74,7 +74,7 @@ void AbilitySliceScheduler::HandleActiveAbilitySlice(const Want &want) void AbilitySliceScheduler::HandleMoveAbilitySliceToBackground() { - if (topAbilitySlice_ == nullptr) { + if (!topAbilitySlice_) { return; } @@ -83,7 +83,7 @@ void AbilitySliceScheduler::HandleMoveAbilitySliceToBackground() void AbilitySliceScheduler::HandleStopAbilitySlice() { - if (topAbilitySlice_ == nullptr) { + if (!topAbilitySlice_) { return; } @@ -145,7 +145,7 @@ void AbilitySliceScheduler::RemoveAbilitySlice(AbilitySlice &slice) Want want { nullptr, nullptr, nullptr, 0 }; // Scheduler the top slice in the stack to Active. auto next = abilitySliceStack_->Pop(); - if (next == nullptr) { + if (!next) { topAbilitySlice_->OnActive(want); return; } @@ -183,7 +183,7 @@ AbilitySlice *AbilitySliceScheduler::GetTargetAbilitySlice() const bool AbilitySliceScheduler::CheckLegalForAdd(const AbilitySlice &caller, AbilitySlice &target, const Want &want) { - if (topAbilitySlice_ == nullptr) { + if (!topAbilitySlice_) { return false; } if (abilitySliceManager_.GetAbilityState() != STATE_ACTIVE) { @@ -204,7 +204,7 @@ bool AbilitySliceScheduler::CheckLegalForAdd(const AbilitySlice &caller, Ability bool AbilitySliceScheduler::CheckLegalForRemove(const AbilitySlice &slice) { - if (topAbilitySlice_ == nullptr) { + if (!topAbilitySlice_) { return false; } if (abilitySliceManager_.GetAbilityState() != STATE_ACTIVE) { @@ -226,7 +226,7 @@ bool AbilitySliceScheduler::CheckLegalForRemove(const AbilitySlice &slice) const std::string AbilitySliceScheduler::GetSliceStackInfo() const { - if (topAbilitySlice_ == nullptr) { + if (!topAbilitySlice_) { return " none"; } std::string buff; diff --git a/frameworks/ability_lite/src/ability_thread.cpp b/frameworks/ability_lite/src/ability_thread.cpp index 46bcef1619b9ea016492c0e9d2816ab892356fa0..4ac5dd0b9618e80c7c61f00868e1ac22f91288c4 100644 --- a/frameworks/ability_lite/src/ability_thread.cpp +++ b/frameworks/ability_lite/src/ability_thread.cpp @@ -88,7 +88,7 @@ void *AbilityThread::UITaskPost(void *arg) prctl(PR_SET_NAME, UI_TASK_THREAD_NAME); auto handler = static_cast(arg); - if (handler == nullptr) { + if (!handler) { HILOG_ERROR(HILOG_MODULE_APP, "EventHandler is nullptr, fail to start loop"); return nullptr; } @@ -134,7 +134,7 @@ void AbilityThread::InitUITaskEnv() void AbilityThread::StartAbilityCallback(const Want &want) { - if ((want.sid == nullptr) || (want.element == nullptr)) { + if (!(want.sid) || !(want.element)) { return; } HILOG_INFO(HILOG_MODULE_APP, "start ability callback"); @@ -172,12 +172,12 @@ void AbilityThread::PerformAppInit(const AppInfo &appInfo) continue; } char realPath[PATH_MAX + 1] = { 0 }; - if (realpath(modulePath.c_str(), realPath) == nullptr) { + if (!realpath(modulePath.c_str(), realPath)) { HILOG_ERROR(HILOG_MODULE_APP, "Fail to get realpath of %{public}s", modulePath.c_str()); continue; } void *handle = dlopen(static_cast(realPath), RTLD_NOW | RTLD_GLOBAL); - if (handle == nullptr) { + if (!handle) { HILOG_ERROR(HILOG_MODULE_APP, "Fail to dlopen %{public}s, [%{public}s]", modulePath.c_str(), dlerror()); exit(-1); } @@ -207,15 +207,15 @@ void AbilityThread::PerformTransactAbilityState(const Want &want, int state, uin HILOG_INFO(HILOG_MODULE_APP, "perform transact ability state to [%{public}d]", state); Ability *ability = nullptr; auto iter = abilities_.find(token); - if ((iter == abilities_.end()) || (iter->second == nullptr)) { - if (want.element == nullptr) { + if ((iter == abilities_.end()) || !(iter->second)) { + if (!(want.element)) { HILOG_ERROR(HILOG_MODULE_APP, "element name is null, fail to load ability"); AbilityMsClient::GetInstance().SchedulerLifecycleDone(token, STATE_INITIAL); return; } auto abilityName = isNativeApp_ ? want.element->abilityName : ACE_ABILITY_NAME; ability = AbilityLoader::GetInstance().GetAbilityByName(abilityName); - if (ability == nullptr) { + if (!ability) { HILOG_ERROR(HILOG_MODULE_APP, "fail to load ability: %{public}s", abilityName); AbilityMsClient::GetInstance().SchedulerLifecycleDone(token, STATE_INITIAL); return; @@ -253,7 +253,7 @@ void AbilityThread::PerformTransactAbilityState(const Want &want, int state, uin void AbilityThread::PerformConnectAbility(const Want &want, uint64_t token) { auto iter = abilities_.find(token); - if (iter == abilities_.end() || iter->second == nullptr) { + if (iter == abilities_.end() || !(iter->second)) { HILOG_ERROR(HILOG_MODULE_APP, "app has been stopped"); return; } @@ -264,7 +264,7 @@ void AbilityThread::PerformConnectAbility(const Want &want, uint64_t token) void AbilityThread::PerformDisconnectAbility(const Want &want, uint64_t token) { auto iter = abilities_.find(token); - if (iter == abilities_.end() || iter->second == nullptr) { + if (iter == abilities_.end() || !(iter->second)) { HILOG_ERROR(HILOG_MODULE_APP, "app has been stopped"); return; } @@ -275,11 +275,11 @@ void AbilityThread::PerformDisconnectAbility(const Want &want, uint64_t token) void AbilityThread::PerformDumpAbility(const Want &want, uint64_t token) { auto iter = abilities_.find(token); - if (iter == abilities_.end() || iter->second == nullptr) { + if (iter == abilities_.end() || !(iter->second)) { HILOG_ERROR(HILOG_MODULE_APP, "app has been stopped"); return; } - if (want.sid == nullptr) { + if (!(want.sid)) { HILOG_ERROR(HILOG_MODULE_APP, "SvcIdentity is null, dump failed"); return; } @@ -364,7 +364,7 @@ void AbilityThread::AttachBundle(uint64_t token) } identity_ = static_cast(AdapterMalloc(sizeof(SvcIdentity))); - if (identity_ == nullptr) { + if (!identity_) { HILOG_ERROR(HILOG_MODULE_APP, "ams identity is null"); return; } diff --git a/frameworks/ability_lite/src/ability_window.cpp b/frameworks/ability_lite/src/ability_window.cpp index 7e4cf4fde517dd5c6b0c3b507075f24bfffb791a..e521dc8dcd8eec8c92b3bca1a13eade1acc10b35 100644 --- a/frameworks/ability_lite/src/ability_window.cpp +++ b/frameworks/ability_lite/src/ability_window.cpp @@ -20,16 +20,16 @@ namespace OHOS { void AbilityWindow::SetRootView(RootView *rootView, int16_t x, int16_t y) { - if (rootView == nullptr) { + if (!rootView) { return; } - if (window_ == nullptr) { + if (!window_) { WindowConfig config = {}; config.rect = rootView->GetRect(); config.rect.SetPosition(x, y); window_ = Window::CreateWindow(config); - if (window_ == nullptr) { + if (!window_) { return; } } else { @@ -47,7 +47,7 @@ void AbilityWindow::SetRootView(RootView *rootView, int16_t x, int16_t y) void AbilityWindow::EnsureLatestUIAttached() const { - if (!isWindowAttached_ || (window_ == nullptr)) { + if (!isWindowAttached_ || (!window_)) { HILOG_ERROR(HILOG_MODULE_APP, "Should SetUIContent before slice active"); exit(-1); } diff --git a/frameworks/abilitymgr_lite/src/ability_manager.cpp b/frameworks/abilitymgr_lite/src/ability_manager.cpp index 591eec887271bb21b1d3fc578d4929378f874e85..0bf10dd7e4984eca3ce1d3172eec4d262096120b 100644 --- a/frameworks/abilitymgr_lite/src/ability_manager.cpp +++ b/frameworks/abilitymgr_lite/src/ability_manager.cpp @@ -26,7 +26,7 @@ extern "C" { const int DEFAULT_TOKEN = 1; int StartAbility(const Want *want) { - if (want == nullptr) { + if (!want) { HILOG_ERROR(HILOG_MODULE_APP, "want is null, StartAbility failed"); return -1; } @@ -37,13 +37,13 @@ int StartAbility(const Want *want) int StartAbilityWithCallback(const Want *want, IAbilityStartCallback iAbilityStartCallback) { - if (want == nullptr || iAbilityStartCallback == nullptr) { + if (!want || !iAbilityStartCallback) { HILOG_ERROR(HILOG_MODULE_APP, "want or callback is null, StartAbilityWithCallback failed!"); return -1; } const SvcIdentity *svc = OHOS::AbilitySelfCallback::GetInstance() .RegisterAbilitySelfCallback(iAbilityStartCallback); - if (svc == nullptr) { + if (!svc) { HILOG_ERROR(HILOG_MODULE_APP, "Register svc failed"); return -1; } @@ -53,7 +53,7 @@ int StartAbilityWithCallback(const Want *want, IAbilityStartCallback iAbilitySta int StopAbility(const Want *want) { - if (want == nullptr) { + if (!want) { HILOG_ERROR(HILOG_MODULE_APP, "want is null, StopAbility failed"); return -1; } @@ -63,11 +63,11 @@ int StopAbility(const Want *want) int ConnectAbility(const Want *want, const IAbilityConnection *conn, void *data) { - if (want == nullptr) { + if (!want) { HILOG_ERROR(HILOG_MODULE_APP, "want is null, ConnectAbility failed"); return -1; } - if (conn == nullptr) { + if (!conn) { HILOG_ERROR(HILOG_MODULE_APP, "conn is null, ConnectAbility failed"); return -1; } @@ -77,7 +77,7 @@ int ConnectAbility(const Want *want, const IAbilityConnection *conn, void *data) int DisconnectAbility(const IAbilityConnection *conn) { - if (conn == nullptr) { + if (!conn) { HILOG_ERROR(HILOG_MODULE_APP, "conn is null, DisconnectAbility failed"); return LITEIPC_EINVAL; } diff --git a/frameworks/abilitymgr_lite/src/ability_self_callback.cpp b/frameworks/abilitymgr_lite/src/ability_self_callback.cpp index d78e425afe28db700ceadab70f26ef80f4fb05cf..3f63a1dd385782e4d9d61115e801ff94582d9c99 100755 --- a/frameworks/abilitymgr_lite/src/ability_self_callback.cpp +++ b/frameworks/abilitymgr_lite/src/ability_self_callback.cpp @@ -33,7 +33,7 @@ AbilitySelfCallback::~AbilitySelfCallback() int32_t InnerCallback(const char *resultMessage, uint8_t resultCode, const IAbilityStartCallback &iAbilityStartCallback) { - if (resultMessage == nullptr || iAbilityStartCallback == nullptr) { + if (!resultMessage || !iAbilityStartCallback) { return PARAM_NULL_ERROR; } if (resultCode == ERR_OK) { @@ -46,18 +46,18 @@ int32_t InnerCallback(const char *resultMessage, uint8_t resultCode, const IAbil int32_t AbilitySelfCallback::Callback(const IpcContext *context, void *ipcMsg, IpcIo *io, void *arg) { - if (ipcMsg == nullptr) { + if (!ipcMsg) { HILOG_ERROR(HILOG_MODULE_APP, "AbilitySelfCallback ipcMsg is nullptr"); return PARAM_NULL_ERROR; } - if (io == nullptr) { + if (!io) { HILOG_ERROR(HILOG_MODULE_APP, "AbilitySelfCallback io is nullptr"); FreeBuffer(NULL, ipcMsg); return PARAM_NULL_ERROR; } IAbilityStartCallback iAbilityStartCallback = GetInstance().GetCallback(); - if (iAbilityStartCallback == nullptr) { + if (!iAbilityStartCallback) { FreeBuffer(NULL, ipcMsg); return PARAM_NULL_ERROR; } @@ -80,7 +80,7 @@ int32_t AbilitySelfCallback::Callback(const IpcContext *context, void *ipcMsg, I int32 AbilitySelfCallback::GenerateLocalServiceId() { svcIdentity_ = reinterpret_cast(AdapterMalloc(sizeof(SvcIdentity))); - if (svcIdentity_ == nullptr) { + if (!svcIdentity_) { return CALLBACK_GENERATE_LOCAL_SERVICEID_FAILED; } @@ -95,10 +95,10 @@ int32 AbilitySelfCallback::GenerateLocalServiceId() const SvcIdentity *AbilitySelfCallback::RegisterAbilitySelfCallback(IAbilityStartCallback &iAbilityStartCallback) { - if (iAbilityStartCallback == nullptr) { + if (!iAbilityStartCallback) { return nullptr; } - if (svcIdentity_ == nullptr) { + if (!svcIdentity_) { int32 ret = GenerateLocalServiceId(); if (ret != ERR_OK) { return nullptr; diff --git a/frameworks/abilitymgr_lite/src/ability_service_manager.cpp b/frameworks/abilitymgr_lite/src/ability_service_manager.cpp index 40ab6ea0630c867edef031eab4e07c3f84c82b1b..748285b9805ae43c1ca62c9218d9d5e8136a3cb2 100644 --- a/frameworks/abilitymgr_lite/src/ability_service_manager.cpp +++ b/frameworks/abilitymgr_lite/src/ability_service_manager.cpp @@ -29,7 +29,7 @@ namespace OHOS { AbilityServiceManager::~AbilityServiceManager() { for (const auto &storeArgs : storeList_) { - if (storeArgs == nullptr) { + if (!storeArgs) { continue; } if (storeArgs->sid != nullptr) { @@ -44,13 +44,13 @@ AbilityServiceManager::~AbilityServiceManager() int AbilityServiceManager::ConnectAbility(const Want &want, const IAbilityConnection &conn, uint64_t token, void *storeArg) { - if (conn.OnAbilityDisconnectDone == nullptr || conn.OnAbilityConnectDone == nullptr) { + if (!conn.OnAbilityDisconnectDone || !conn.OnAbilityConnectDone) { HILOG_INFO(HILOG_MODULE_APP, "IAbilityConnection callback func is null"); return LITEIPC_EINVAL; } StoreArgs *storeArgs = AddStoreArgs(conn, storeArg); - if (storeArgs == nullptr) { + if (!storeArgs) { return LITEIPC_EINVAL; } AbilityMsClient::GetInstance().Initialize(); @@ -74,7 +74,7 @@ int AbilityServiceManager::ConnectAbility(const Want &want, const IAbilityConnec int AbilityServiceManager::DisconnectAbility(const IAbilityConnection &conn, uint64_t token) { StoreArgs *storeArgs = RemoveStoreArgs(&conn, nullptr); - if (storeArgs == nullptr) { + if (!storeArgs) { HILOG_INFO(HILOG_MODULE_APP, "no need to disconnect"); return LITEIPC_EINVAL; } @@ -113,7 +113,7 @@ StoreArgs *AbilityServiceManager::GetStoreArgs(const IAbilityConnection &conn) c StoreArgs *AbilityServiceManager::RemoveStoreArgs(const IAbilityConnection *conn, StoreArgs *storeArgs) { std::lock_guard lock(mutex_); - if (storeArgs == nullptr) { + if (!storeArgs) { storeArgs = GetStoreArgs(*conn); } storeList_.remove(storeArgs); @@ -125,8 +125,8 @@ int32_t AbilityServiceManager::ConnectAbilityCallBack(const IpcContext* context, { // param check StoreArgs *storeArgs = static_cast(arg); - if (storeArgs == nullptr || ipcMsg == nullptr || storeArgs->conn == nullptr || - storeArgs->conn->OnAbilityConnectDone == nullptr || storeArgs->conn->OnAbilityDisconnectDone == nullptr) { + if (!storeArgs || !ipcMsg || !(storeArgs->conn) || + !(storeArgs->conn->OnAbilityConnectDone) || !(storeArgs->conn->OnAbilityDisconnectDone)) { HILOG_ERROR(HILOG_MODULE_APP, "storeArgs or callback func or ipcMsg is null"); AbilityServiceManager::GetInstance().RemoveStoreArgs(nullptr, storeArgs); ClearStore(storeArgs); @@ -140,7 +140,7 @@ int32_t AbilityServiceManager::ConnectAbilityCallBack(const IpcContext* context, int resultCode = (funcId != SCHEDULER_ABILITY_CONNECT_FAIL) ? 0 : -1; // parse service sid SvcIdentity *serviceSid = (funcId == SCHEDULER_ABILITY_CONNECT) ? IpcIoPopSvc(data) : nullptr; - if ((funcId == SCHEDULER_ABILITY_CONNECT) && (serviceSid == nullptr)) { + if ((funcId == SCHEDULER_ABILITY_CONNECT) && (!serviceSid)) { resultCode = -1; } // parse element @@ -168,7 +168,7 @@ int32_t AbilityServiceManager::ConnectAbilityCallBack(const IpcContext* context, void AbilityServiceManager::ClearStore(StoreArgs *storeArgs) { - if ((storeArgs == nullptr) || (storeArgs->sid == nullptr)) { + if ((!storeArgs) || !(storeArgs->sid)) { HILOG_INFO(HILOG_MODULE_APP, "no need to clear storeArgs"); return; } diff --git a/frameworks/abilitymgr_lite/src/abilityms_client.cpp b/frameworks/abilitymgr_lite/src/abilityms_client.cpp index d1e5e8da693fd6288b1e9a01deb0900b5810fe63..914cf8b1908385e291db509f3ff427025710763c 100755 --- a/frameworks/abilitymgr_lite/src/abilityms_client.cpp +++ b/frameworks/abilitymgr_lite/src/abilityms_client.cpp @@ -40,14 +40,14 @@ bool AbilityMsClient::Initialize() const int retry = RETRY_TIMES; while (retry--) { IUnknown *iUnknown = SAMGR_GetInstance()->GetFeatureApi(AMS_SERVICE, AMS_FEATURE); - if (iUnknown == nullptr) { + if (!iUnknown) { HILOG_ERROR(HILOG_MODULE_APP, "iUnknown is null"); usleep(ERROR_SLEEP_TIMES); // sleep 300ms continue; } (void)iUnknown->QueryInterface(iUnknown, CLIENT_PROXY_VER, (void **)&amsProxy_); - if (amsProxy_ == nullptr) { + if (!amsProxy_) { HILOG_ERROR(HILOG_MODULE_APP, "ams proxy is null"); usleep(ERROR_SLEEP_TIMES); // sleep 300ms continue; @@ -61,7 +61,7 @@ bool AbilityMsClient::Initialize() const int AbilityMsClient::SchedulerLifecycleDone(uint64_t token, int state) const { - if (amsProxy_ == nullptr) { + if (!amsProxy_) { return PARAM_NULL_ERROR; } IpcIo req; @@ -74,7 +74,7 @@ int AbilityMsClient::SchedulerLifecycleDone(uint64_t token, int state) const int AbilityMsClient::ScheduleAms(const Want *want, uint64_t token, const SvcIdentity *sid, int commandType) const { - if (amsProxy_ == nullptr) { + if (!amsProxy_) { return PARAM_NULL_ERROR; } IpcIo req; diff --git a/frameworks/abilitymgr_lite/src/slite/abilityms_slite_client.cpp b/frameworks/abilitymgr_lite/src/slite/abilityms_slite_client.cpp index 6cb9ff8b841e7ccf3c32bb65be9872096b6f61f7..47e315b2cbb6635063c72a9bac1be9b666a6869c 100644 --- a/frameworks/abilitymgr_lite/src/slite/abilityms_slite_client.cpp +++ b/frameworks/abilitymgr_lite/src/slite/abilityms_slite_client.cpp @@ -35,14 +35,14 @@ bool AbilityMsClient::Initialize() const int retry = RETRY_TIMES; while (retry--) { IUnknown *iUnknown = SAMGR_GetInstance()->GetFeatureApi(AMS_SERVICE, AMS_SLITE_FEATURE); - if (iUnknown == nullptr) { + if (!iUnknown) { HILOG_ERROR(HILOG_MODULE_APP, "iUnknown is null"); osDelay(ERROR_SLEEP_TIMES); // sleep 300ms continue; } (void)iUnknown->QueryInterface(iUnknown, DEFAULT_VERSION, (void **)&amsProxy_); - if (amsProxy_ == nullptr) { + if (!amsProxy_) { HILOG_ERROR(HILOG_MODULE_APP, "ams proxy is null"); osDelay(ERROR_SLEEP_TIMES); // sleep 300ms continue; @@ -54,18 +54,18 @@ bool AbilityMsClient::Initialize() const int AbilityMsClient::StartAbility(const Want *want) const { - if (want == nullptr || want->element == nullptr || !Initialize()) { + if (!want || !(want->element) || !Initialize()) { return PARAM_CHECK_ERROR; } AbilityMgrService *service = AbilityMgrService::GetInstance(); - if (service == nullptr) { + if (!service) { return PARAM_CHECK_ERROR; } // 申请want内存,在服务端用完释放 Want *info = static_cast(AdapterMalloc(sizeof(Want))); - if (info == nullptr) { + if (!info) { return MEMORY_MALLOC_ERROR; } info->element = nullptr; @@ -86,7 +86,7 @@ int AbilityMsClient::StartAbility(const Want *want) const int AbilityMsClient::TerminateAbility(uint64_t token) const { AbilityMgrService *service = AbilityMgrService::GetInstance(); - if (service == nullptr) { + if (!service) { return PARAM_CHECK_ERROR; } Request request = { @@ -101,7 +101,7 @@ int AbilityMsClient::TerminateAbility(uint64_t token) const int AbilityMsClient::SchedulerLifecycleDone(uint64_t token, int state) const { AbilityMgrService *service = AbilityMgrService::GetInstance(); - if (service == nullptr) { + if (!service) { return PARAM_CHECK_ERROR; } Request request = { @@ -116,7 +116,7 @@ int AbilityMsClient::SchedulerLifecycleDone(uint64_t token, int state) const int AbilityMsClient::ForceStopBundle(uint64_t token) const { AbilityMgrService *service = AbilityMgrService::GetInstance(); - if (service == nullptr) { + if (!service) { return PARAM_CHECK_ERROR; } Request request = { @@ -139,7 +139,7 @@ ElementName *AbilityMsClient::GetTopAbility() const int AbilityMsClient::ForceStop(char *bundlename) const { AbilityMgrService *service = AbilityMgrService::GetInstance(); - if (service == nullptr) { + if (!service) { return PARAM_CHECK_ERROR; } char* name = Utils::Strdup(bundlename); diff --git a/frameworks/want_lite/src/want.cpp b/frameworks/want_lite/src/want.cpp index 2178ce79c9818cb4f2a1f0d1ae8d38573e48c386..315e7a78d953a7bf4911450975a370b5b035f168 100644 --- a/frameworks/want_lite/src/want.cpp +++ b/frameworks/want_lite/src/want.cpp @@ -60,7 +60,7 @@ constexpr uint8_t KEY_VALUE_PAIR_TYPE = 97; void ClearWant(Want *want) { - if (want == nullptr) { + if (!want) { return; } @@ -74,14 +74,14 @@ void ClearWant(Want *want) bool SetWantElement(Want *want, ElementName element) { - if (want == nullptr) { + if (!want) { return false; } ClearElement(want->element); AdapterFree(want->element); want->element = reinterpret_cast(AdapterMalloc(sizeof(ElementName))); - if (want->element == nullptr) { + if (!(want->element)) { return false; } want->element->deviceId = OHOS::Utils::Strdup(element.deviceId); @@ -97,7 +97,7 @@ Tlv *EncapTlv(uint8_t type, uint8_t length, const void *value, uint8_t valueLen) // Tlv header can only has 2 bytes. uint8_t totalLen = valueLen + 2; entity = calloc(1, totalLen); - if (entity == nullptr) { + if (!entity) { return nullptr; } @@ -125,7 +125,7 @@ Tlv *CombineKeyValueTlv(Tlv *keyTlv, Tlv *valueTlv) { uint8_t newTlvValueLen = keyTlv->totalLen + valueTlv->totalLen; void *newTlvValue = calloc(1, newTlvValueLen); - if (newTlvValue == nullptr) { + if (!newTlvValue) { return nullptr; } if (memcpy_s((unsigned char *)newTlvValue, keyTlv->totalLen, keyTlv->entity, keyTlv->totalLen) != 0 || @@ -145,7 +145,7 @@ bool UpdateWantData(Want *want, Tlv *tlv) bool result = false; if (want->data != nullptr) { void *newWantData = calloc(1, tlv->totalLen + want->dataLength); - if (newWantData == nullptr) { + if (!newWantData) { return result; } if (memcpy_s(newWantData, want->dataLength, want->data, want->dataLength) != 0 || @@ -171,7 +171,7 @@ bool SetIntParam(Want *want, const char *key, uint8_t keyLen, int32_t value) } Tlv *keyTlv = EncapTlv(STRING_VALUE_TYPE, keyLen, (void *)key, keyLen); - if (keyTlv == nullptr) { + if (!keyTlv) { return result; } if (value < 0) { @@ -185,14 +185,14 @@ bool SetIntParam(Want *want, const char *key, uint8_t keyLen, int32_t value) intBuffer[i] = value >> (8 * (3- i)); } Tlv *valueTlv = EncapTlv(INT_VALUE_TYPE, sizeof(int), (void *)intBuffer, sizeof(int)); - if (valueTlv == nullptr) { + if (!valueTlv) { FreeTlvStruct(keyTlv); return result; } Tlv *newTlv = CombineKeyValueTlv(keyTlv, valueTlv); FreeTlvStruct(keyTlv); FreeTlvStruct(valueTlv); - if (newTlv == nullptr) { + if (!newTlv) { return result; } if (UpdateWantData(want, newTlv)) { @@ -211,19 +211,19 @@ bool SetStrParam(Want *want, const char *key, uint8_t keyLen, const char *value, } Tlv *keyTlv = EncapTlv(STRING_VALUE_TYPE, keyLen, (void *)key, keyLen); - if (keyTlv == nullptr) { + if (!keyTlv) { return result; } Tlv *valueTlv = EncapTlv(STRING_VALUE_TYPE, valueLen, (void *)value, valueLen); - if (valueTlv == nullptr) { + if (!valueTlv) { FreeTlvStruct(keyTlv); return result; } Tlv *newTlv = CombineKeyValueTlv(keyTlv, valueTlv); FreeTlvStruct(keyTlv); FreeTlvStruct(valueTlv); - if (newTlv == nullptr) { + if (!newTlv) { return result; } if (UpdateWantData(want, newTlv)) { @@ -237,13 +237,13 @@ bool SetStrParam(Want *want, const char *key, uint8_t keyLen, const char *value, #ifdef OHOS_APPEXECFWK_BMS_BUNDLEMANAGER bool SetWantSvcIdentity(Want *want, SvcIdentity sid) { - if (want == nullptr) { + if (!want) { return false; } AdapterFree(want->sid); want->sid = reinterpret_cast(AdapterMalloc(sizeof(SvcIdentity))); - if (want->sid == nullptr) { + if (!(want->sid)) { return false; } if (memcpy_s(want->sid, sizeof(SvcIdentity), &sid, sizeof(SvcIdentity)) != EOK) { @@ -257,13 +257,13 @@ bool SetWantSvcIdentity(Want *want, SvcIdentity sid) bool SetWantData(Want *want, const void *data, uint16_t dataLength) { - if (want == nullptr) { + if (!want) { return false; } AdapterFree(want->data); want->data = OHOS::Utils::Memdup(data, dataLength); - if (want->data == nullptr) { + if (!(want->data)) { want->dataLength = 0; return false; } @@ -275,11 +275,11 @@ bool SetWantData(Want *want, const void *data, uint16_t dataLength) #ifdef OHOS_APPEXECFWK_BMS_BUNDLEMANAGER bool SerializeWant(IpcIo *io, const Want *want) { - if ((io == nullptr) || (want == nullptr) || (want->dataLength > DATA_LENGTH)) { + if ((!io) || (!want) || (want->dataLength > DATA_LENGTH)) { return false; } - if (want->element == nullptr) { + if (!(want->element)) { IpcIoPushInt32(io, VALUE_NULL); } else { IpcIoPushInt32(io, VALUE_OBJECT); @@ -299,7 +299,7 @@ bool SerializeWant(IpcIo *io, const Want *want) IpcIoPushDataBuff(io, &buff); #endif } - if (want->sid == nullptr) { + if (!(want->sid)) { IpcIoPushInt32(io, VALUE_NULL); } else { IpcIoPushInt32(io, VALUE_OBJECT); @@ -311,13 +311,13 @@ bool SerializeWant(IpcIo *io, const Want *want) bool DeserializeWant(Want *want, IpcIo *io) { - if ((want == nullptr) || (io == nullptr)) { + if ((!want) || (!io)) { return false; } if (IpcIoPopInt32(io) == VALUE_OBJECT) { want->element = reinterpret_cast(AdapterMalloc(sizeof(ElementName))); - if (want->element == nullptr || + if (!(want->element) || memset_s(want->element, sizeof(ElementName), 0, sizeof(ElementName)) != EOK || !DeserializeElement(want->element, io)) { AdapterFree(want->element); @@ -334,7 +334,7 @@ bool DeserializeWant(Want *want, IpcIo *io) } #else BuffPtr *buff = IpcIoPopDataBuff(io); - if (buff == nullptr) { + if (!buff) { ClearWant(want); return false; } @@ -348,7 +348,7 @@ bool DeserializeWant(Want *want, IpcIo *io) } if (IpcIoPopInt32(io) == VALUE_OBJECT) { auto sid = IpcIoPopSvc(io); - if ((sid == nullptr) || !SetWantSvcIdentity(want, *sid)) { + if ((!sid) || !SetWantSvcIdentity(want, *sid)) { #ifdef __LINUX__ AdapterFree(sid); sid = nullptr; @@ -367,11 +367,11 @@ bool DeserializeWant(Want *want, IpcIo *io) Want *WantParseUri(const char *uri) { - if (uri == nullptr) { + if (!uri) { return nullptr; } char *parseUri = OHOS::Utils::Strdup(uri); - if (parseUri == nullptr) { + if (!parseUri) { return nullptr; } ElementName element = { nullptr, nullptr, nullptr }; @@ -385,7 +385,7 @@ Want *WantParseUri(const char *uri) break; } char *endIndex = strchr(beginIndex, URI_SEPARATOR); - if ((endIndex == nullptr) || (endIndex <= beginIndex)) { + if ((!endIndex) || (endIndex <= beginIndex)) { AdapterFree(parseUri); return nullptr; } @@ -461,7 +461,7 @@ const char *WantToUri(Want want) uint16_t len = uriString.size(); char *uri = reinterpret_cast(AdapterMalloc(len + 1)); - if (uri == nullptr) { + if (!uri) { return nullptr; } if (strncpy_s(uri, len + 1, uriString.c_str(), len) < 0) { diff --git a/interfaces/kits/js/napi/js_aafwk.cpp b/interfaces/kits/js/napi/js_aafwk.cpp index 058a000c10c069a6c6dd47584a1a3009f954e680..9ca149cc27cd8a4fcbad2f74e03a2672b3b8c6bd 100644 --- a/interfaces/kits/js/napi/js_aafwk.cpp +++ b/interfaces/kits/js/napi/js_aafwk.cpp @@ -20,6 +20,12 @@ #include "napi/native_node_api.h" #include "ability_errors.h" +#ifdef DEBUG +#define ASSERT(f) assert(f) +else +#define ASSERT(f) ((void)0) +#endif + #define GET_PARAMS(env, info, num) \ do { \ size_t argc = num; \ @@ -46,18 +52,18 @@ static int JSAafwkStartAbility(napi_env env, napi_callback_info info) size_t argc = 1; napi_value args[1] = {0}; status = napi_get_cb_info(env, info, &argc, args, NULL, NULL); - assert(status == napi_ok); + ASSERT(status == napi_ok); napi_valuetype types[1]; status = napi_typeof(env, args[0], types); - assert(status == napi_ok); - assert(argc == 1 && types[0] == napi_object); + ASSERT(status == napi_ok); + ASSERT(argc == 1 && types[0] == napi_object); Want want; if (memset_s(&want, sizeof(Want), 0x00, sizeof(Want)) != 0) { return MEMORY_MALLOC_ERROR; } - if (GetWantFromNapiValue(env, args[0], want) == false) { + if (!GetWantFromNapiValue(env, args[0], want)) { return PARAM_CHECK_ERROR; } StartAbility(&want); @@ -70,18 +76,18 @@ static int JSAafwkStopAbility(napi_env env, napi_callback_info info) size_t argc = 1; napi_value args[1] = {0};; status = napi_get_cb_info(env, info, &argc, args, NULL, NULL); - assert(status == napi_ok); + ASSERT(status == napi_ok); napi_valuetype types[1]; status = napi_typeof(env, args[0], types); - assert(status == napi_ok); - assert(argc == 1 && types[0] == napi_object); + ASSERT(status == napi_ok); + ASSERT(argc == 1 && types[0] == napi_object); Want want; if (memset_s(&want, sizeof(Want), 0x00, sizeof(Want)) != 0) { return MEMORY_MALLOC_ERROR; } - if (GetWantFromNapiValue(env, args[0], want) == false) { + if (!GetWantFromNapiValue(env, args[0], want)) { return PARAM_CHECK_ERROR; } StopAbility(&want); diff --git a/services/abilitymgr_lite/include/util/abilityms_log.h b/services/abilitymgr_lite/include/util/abilityms_log.h index 97ae61ff6fe18040a034deb887a663fb4fe03781..7f3e665690cccba0d93dd8b8a2235d00cc31d385 100644 --- a/services/abilitymgr_lite/include/util/abilityms_log.h +++ b/services/abilitymgr_lite/include/util/abilityms_log.h @@ -64,7 +64,7 @@ namespace OHOS { #define CHECK_NULLPTR_RETURN_PTR(point, name, fmt) \ do { \ - if ((point) == nullptr) { \ + if (!(point) ) { \ PRINTE(name, fmt); \ return nullptr; \ } \ @@ -72,7 +72,7 @@ namespace OHOS { #define CHECK_NULLPTR_RETURN(point, name, fmt) \ do { \ - if ((point) == nullptr) { \ + if (!(point) ) { \ PRINTE(name, fmt); \ return; \ } \ @@ -80,7 +80,7 @@ namespace OHOS { #define CHECK_NULLPTR_RETURN_CODE(point, name, fmt, code) \ do { \ - if ((point) == nullptr) { \ + if (!(point) ) { \ PRINTE(name, fmt); \ return code; \ } \ diff --git a/services/abilitymgr_lite/src/ability_connect_mission.cpp b/services/abilitymgr_lite/src/ability_connect_mission.cpp index 9a89d312a13ed02311f8f2ec7fd8554164c8aa6e..fb59d8272def6654c91750e69289b89b7adffeaf 100644 --- a/services/abilitymgr_lite/src/ability_connect_mission.cpp +++ b/services/abilitymgr_lite/src/ability_connect_mission.cpp @@ -53,7 +53,7 @@ PageAbilityRecord *AbilityConnectMission::FindServiceRecord(const char *bundleNa if (record != nullptr) { const char *recordBundleName = record->GetAbilityInfo().bundleName; const char *recordAbilityName = record->GetAbilityInfo().name; - if (recordBundleName == nullptr || recordAbilityName == nullptr) { + if (!recordBundleName || !recordAbilityName) { continue; } if (strcmp(recordBundleName, bundleName) == 0 && strcmp(recordAbilityName, abilityName) == 0) { @@ -107,12 +107,12 @@ void AbilityConnectMission::RemoveServiceRecord(const char *bundleName) int32_t AbilityConnectMission::CountServiceInApp(const char *bundleName) { - if (bundleName == nullptr) { + if (!bundleName) { return 0; } int32_t retVal = 0; for (const auto record : serviceRecords_) { - if (record == nullptr) { + if (!record) { continue; } if (record->GetAbilityInfo().bundleName != nullptr && diff --git a/services/abilitymgr_lite/src/ability_inner_feature.cpp b/services/abilitymgr_lite/src/ability_inner_feature.cpp index 3ef64600eca627d378703c08f4f32d05e77a3932..6d295e2f51a377e852f0362ea27a595cd981fc0c 100644 --- a/services/abilitymgr_lite/src/ability_inner_feature.cpp +++ b/services/abilitymgr_lite/src/ability_inner_feature.cpp @@ -72,7 +72,7 @@ AbilityInnerFeature::AbilityInnerFeature() : Feature(), identity_() int32 AbilityInnerFeature::Invoke(IServerProxy *iProxy, int funcId, void *origin, IpcIo *req, IpcIo *reply) { PRINTI("AbilityInnerFeature", "ams invoke called"); - if (req == nullptr) { + if (!req) { return EC_INVALID; } if (funcId >= INNER_BEGIN && funcId < COMMAND_END) { @@ -101,7 +101,7 @@ void AbilityInnerFeature::OnFeatureStop(Feature *feature, Identity identity) BOOL AbilityInnerFeature::OnFeatureMessage(Feature *feature, Request *request) { - if (feature == nullptr || request == nullptr) { + if (!feature || !request) { return FALSE; } @@ -113,7 +113,7 @@ int32 AbilityInnerFeature::TerminateAppInvoke(const void *origin, IpcIo *req) { size_t len = 0; char *bundleName = reinterpret_cast(IpcIoPopString(req, &len)); - if (bundleName == nullptr || len == 0) { + if (!bundleName || len == 0) { PRINTE("AbilityInnerFeature", "bundleName is null"); return EC_INVALID; } @@ -135,7 +135,7 @@ int32 AbilityInnerFeature::TerminateApp(const char *bundleName) } char *name = Utils::Strdup(bundleName); - if (name == nullptr) { + if (!name) { return EC_NOMEMORY; } Request request = { @@ -155,7 +155,7 @@ int32 AbilityInnerFeature::TerminateApp(const char *bundleName) int32 AbilityInnerFeature::DumpAbilityInvoke(const void *origin, IpcIo *req) { Want want = { nullptr, nullptr, nullptr, 0 }; - if (!DeserializeWant(&want, req) || (want.sid == nullptr)) { + if (!DeserializeWant(&want, req) || !(want.sid)) { ClearWant(&want); return EC_FAILURE; } diff --git a/services/abilitymgr_lite/src/ability_list.cpp b/services/abilitymgr_lite/src/ability_list.cpp index bf14077a54dc020096e1a4bbe39a6a02e6cb0e8f..f80d7ff039c66ea9e2edce07a3c023c3b52b83f5 100644 --- a/services/abilitymgr_lite/src/ability_list.cpp +++ b/services/abilitymgr_lite/src/ability_list.cpp @@ -21,11 +21,11 @@ namespace OHOS { void AbilityList::Add(AbilityRecord *abilityRecord) { - if (abilityRecord == nullptr) { + if (!abilityRecord) { return; } - if (Get(abilityRecord->GetToken()) == nullptr) { + if (!Get(abilityRecord->GetToken())) { abilityList_.PushBack(abilityRecord); } } @@ -34,7 +34,7 @@ AbilityRecord *AbilityList::Get(uint16_t token) const { for (auto node = abilityList_.Begin(); node != abilityList_.End(); node = node->next_) { AbilityRecord *record = node->value_; - if (record == nullptr) { + if (!record) { continue; } if (record->GetToken() == token) { @@ -47,13 +47,13 @@ AbilityRecord *AbilityList::Get(uint16_t token) const AbilityRecord *AbilityList::Get(const char *bundleName) const { - if (bundleName == nullptr) { + if (!bundleName) { return nullptr; } for (auto node = abilityList_.Begin(); node != abilityList_.End(); node = node->next_) { AbilityRecord *record = node->value_; - if (record == nullptr || record->GetAppName() == nullptr) { + if (!record || !record->GetAppName()) { continue; } if (strcmp(bundleName, record->GetAppName()) == 0) { @@ -68,7 +68,7 @@ void AbilityList::Erase(uint16_t token) { for (auto node = abilityList_.Begin(); node != abilityList_.End(); node = node->next_) { AbilityRecord *record = node->value_; - if (record == nullptr) { + if (!record) { continue; } if (record->GetToken() == token) { diff --git a/services/abilitymgr_lite/src/ability_mgr_feature.cpp b/services/abilitymgr_lite/src/ability_mgr_feature.cpp index e0f17cd7909fda9e724d48f80c5cdf05423bc0e2..dcc8ddf6dd7381d349856b35652eb42219b0f6f0 100644 --- a/services/abilitymgr_lite/src/ability_mgr_feature.cpp +++ b/services/abilitymgr_lite/src/ability_mgr_feature.cpp @@ -87,7 +87,7 @@ AbilityMgrFeature::AbilityMgrFeature() : Feature(), identity_() int32 AbilityMgrFeature::Invoke(IServerProxy *iProxy, int funcId, void *origin, IpcIo *req, IpcIo *reply) { PRINTI("AbilityMgrFeature", "ams invoke called"); - if (req == nullptr) { + if (!req) { return EC_INVALID; } if (funcId >= START_ABILITY && funcId < INNER_BEGIN) { @@ -118,7 +118,7 @@ void AbilityMgrFeature::OnFeatureStop(Feature *feature, Identity identity) BOOL AbilityMgrFeature::OnFeatureMessage(Feature *feature, Request *request) { - if (feature == nullptr || request == nullptr) { + if (!feature || !request) { return FALSE; } @@ -153,7 +153,7 @@ int32 AbilityMgrFeature::StartAbilityInvoke(const void *origin, IpcIo *req) if (!DeserializeWant(&want, req)) { return EC_FAILURE; } - if (want.element == nullptr) { + if (!(want.element)) { PRINTE("AbilityMgrFeature", "invalid argument"); return EC_INVALID; } @@ -177,7 +177,7 @@ int32 AbilityMgrFeature::StartAbilityWithCbInvoke(const void *origin, IpcIo *req return EC_INVALID; } SvcIdentity *svcIdentity = IpcIoPopSvc(req); - if (svcIdentity == nullptr) { + if (!svcIdentity) { svc_ = {0}; return EC_INVALID; } @@ -191,7 +191,7 @@ int32 AbilityMgrFeature::StartAbilityWithCbInvoke(const void *origin, IpcIo *req if (!DeserializeWant(&want, req)) { return EC_FAILURE; } - if (want.element == nullptr) { + if (!want.element) { PRINTE("AbilityMgrFeature", "invalid argument"); return EC_INVALID; } @@ -215,7 +215,7 @@ int32 AbilityMgrFeature::StartRemoteAbilityInner(const Want *want, const char *d { IUnknown *iUnknown = SAMGR_GetInstance()->GetFeatureApi(DISTRIBUTED_SCHEDULE_SERVICE, DMSLITE_FEATURE); DmsProxy *dmsInterface = NULL; - if (iUnknown == NULL) { + if (!iUnknown) { return EC_INVALID; } int32 retVal = iUnknown->QueryInterface(iUnknown, DEFAULT_VERSION, (void**) &dmsInterface); @@ -227,7 +227,7 @@ int32 AbilityMgrFeature::StartRemoteAbilityInner(const Want *want, const char *d }; if (callback != nullptr) { - if (myCallback_ == nullptr) { + if (!myCallback_) { myCallback_ = new IDmsListener(); } myCallback_ -> OnResultCallback = callback; @@ -240,7 +240,7 @@ int32 AbilityMgrFeature::StartRemoteAbilityInner(const Want *want, const char *d int32 AbilityMgrFeature::StartAbilityInner(const Want *want, pid_t callingUid) { - if (want == nullptr || want->element == nullptr) { + if (!want || !(want->element)) { PRINTE("AbilityMgrFeature", "invalid argument"); return EC_INVALID; } @@ -320,7 +320,7 @@ int32 AbilityMgrFeature::AttachBundleInvoke(const void *origin, IpcIo *req) { uint64_t token = IpcIoPopUint64(req); SvcIdentity *svcIdentity = IpcIoPopSvc(req); - if (svcIdentity == nullptr) { + if (!svcIdentity) { return EC_INVALID; } #ifdef __LINUX__ @@ -391,7 +391,7 @@ int32 AbilityMgrFeature::ConnectAbility(const Want *want, SvcIdentity *svc, uint int32 AbilityMgrFeature::ConnectAbilityInner(const Want *want, SvcIdentity *svc, uint64_t token, pid_t callingUid) { - if (want == nullptr || want->element == nullptr || svc == nullptr) { + if (!want || !(want->element) || !svc) { return EC_INVALID; } Want *data = new Want(); @@ -433,7 +433,7 @@ int32 AbilityMgrFeature::DisconnectAbilityInvoke(const void *origin, IpcIo *req) int32 AbilityMgrFeature::DisconnectAbility(SvcIdentity *svc, uint64_t token) { - if (svc == nullptr) { + if (!svc) { return EC_INVALID; } auto transParam = new AbilityConnectTransParam(nullptr, *svc, token); @@ -459,7 +459,7 @@ int32 AbilityMgrFeature::ConnectAbilityDoneInvoke(const void *origin, IpcIo *req { uint64_t token = IpcIoPopUint64(req); SvcIdentity *sid = IpcIoPopSvc(req); - if (sid == nullptr) { + if (!sid) { return EC_INVALID; } auto transParam = new AbilityConnectTransParam(nullptr, *sid, token); @@ -523,7 +523,7 @@ int32 AbilityMgrFeature::StopAbility(const Want *want) int32 AbilityMgrFeature::StopAbilityInner(const Want *want, pid_t callingUid) { - if (want == nullptr || want->element == nullptr) { + if (!want || !(want->element)) { PRINTE("AbilityMgrFeature", "invalid argument"); return EC_INVALID; } @@ -560,7 +560,7 @@ int32 AbilityMgrFeature::RestartApp(const char *bundleName) return EC_INVALID; } char *name = Utils::Strdup(bundleName); - if (name == nullptr) { + if (!name) { return EC_NOMEMORY; } Request request = { @@ -580,7 +580,7 @@ int32 AbilityMgrFeature::RestartApp(const char *bundleName) int32 AbilityMgrFeature::AppDeathNotify(const IpcContext* context, void *ipcMsg, IpcIo *data, void *arg) { AppInfo *appInfo = reinterpret_cast(arg); - if (appInfo == nullptr) { + if (!appInfo) { return EC_INVALID; } #ifdef __LINUX__ diff --git a/services/abilitymgr_lite/src/ability_mgr_handler.cpp b/services/abilitymgr_lite/src/ability_mgr_handler.cpp index 84900fa6581a5d4ed1939311f4cc848d77c8b504..b20699d27563e80808558183cea9929147926613 100644 --- a/services/abilitymgr_lite/src/ability_mgr_handler.cpp +++ b/services/abilitymgr_lite/src/ability_mgr_handler.cpp @@ -333,7 +333,7 @@ void AbilityMgrHandler::TerminateService(Want *want, pid_t callingUid) void AbilityMgrHandler::StartAbilityCallback(const Want *want, int code) { - if ((want == nullptr) || (want->sid == nullptr) || (code == EC_SUCCESS)) { + if (!want || !(want->sid) || (code == EC_SUCCESS)) { return; } PRINTI("AbilityMgrHandler", "start ability failed callback"); @@ -363,7 +363,7 @@ void AbilityMgrHandler::DumpAbility(const AbilityDumpClient *client) void AbilityMgrHandler::ConnectAbilityCallback(AbilityConnectTransParam *transParam, int code) { - if (transParam == nullptr || code == EC_SUCCESS) { + if (!transParam || code == EC_SUCCESS) { return; } PRINTI("AbilityMgrHandler", "connect ability failed"); diff --git a/services/abilitymgr_lite/src/ability_mgr_service.cpp b/services/abilitymgr_lite/src/ability_mgr_service.cpp index de23326689b59e81973945e28a8e2983a910c4e4..4fd08cee96d4822b35587d8f60f52630d2f97e18 100755 --- a/services/abilitymgr_lite/src/ability_mgr_service.cpp +++ b/services/abilitymgr_lite/src/ability_mgr_service.cpp @@ -61,7 +61,7 @@ const Identity *AbilityMgrService::GetIdentity() BOOL AbilityMgrService::ServiceInitialize(Service *service, Identity identity) { - if (service == nullptr) { + if (!service) { return FALSE; } AbilityMgrService *abilityManagerService = static_cast(service); @@ -71,7 +71,7 @@ BOOL AbilityMgrService::ServiceInitialize(Service *service, Identity identity) BOOL AbilityMgrService::ServiceMessageHandle(Service *service, Request *request) { - if (request == nullptr) { + if (!request) { return FALSE; } #ifdef __LITEOS_M__ diff --git a/services/abilitymgr_lite/src/ability_mgr_slite_feature.cpp b/services/abilitymgr_lite/src/ability_mgr_slite_feature.cpp index 164097a2a08481e709210fbf8df385f21b11c363..e90b33f19262fa684f21ac8945cf1d443e8e9681 100755 --- a/services/abilitymgr_lite/src/ability_mgr_slite_feature.cpp +++ b/services/abilitymgr_lite/src/ability_mgr_slite_feature.cpp @@ -84,7 +84,7 @@ void AbilityMgrSliteFeature::OnFeatureStop(Feature *feature, Identity identity) BOOL AbilityMgrSliteFeature::OnFeatureMessage(Feature *feature, Request *request) { - if (feature == nullptr || request == nullptr) { + if (!feature || !request) { return FALSE; } return TRUE; diff --git a/services/abilitymgr_lite/src/ability_mission_stack.cpp b/services/abilitymgr_lite/src/ability_mission_stack.cpp index 06c8a6d98b1f06f478df78fb7d08eef2c74ff914..76ca5e7b3c2b12bed1600d98042fde5b951c3460 100644 --- a/services/abilitymgr_lite/src/ability_mission_stack.cpp +++ b/services/abilitymgr_lite/src/ability_mission_stack.cpp @@ -73,7 +73,7 @@ void AbilityMissionStack::RemoveMissionRecord(AbilityConnectMission *connectMiss bool AbilityMissionStack::IsTopMissionRecord(const char *bundleName) const { - if (bundleName == nullptr) { + if (!bundleName) { return false; } AbilityMissionRecord *topMissionRecord = missionRecords_.back(); @@ -102,7 +102,7 @@ const AbilityMissionRecord *AbilityMissionStack::GetTopMissionRecord() const PageAbilityRecord *AbilityMissionStack::FindPageAbility(uint64_t token) const { for (const auto missionRecord : missionRecords_) { - if (missionRecord == nullptr) { + if (!missionRecord) { continue; } PageAbilityRecord *record = missionRecord->FindPageAbility(token); diff --git a/services/abilitymgr_lite/src/ability_record.cpp b/services/abilitymgr_lite/src/ability_record.cpp index 5a1125aa76f1e73c4bba9cda2886494035456745..8624f5f39416a314c4322c30fb5f8d18dffcee49 100755 --- a/services/abilitymgr_lite/src/ability_record.cpp +++ b/services/abilitymgr_lite/src/ability_record.cpp @@ -48,7 +48,7 @@ void AbilityRecord::SetAppData(const void *appData, uint16_t dataLength) { AdapterFree(appData_); appData_ = Utils::Memdup(appData, dataLength); - if (appData == nullptr) { + if (!appData) { dataLength_ = 0; return; } diff --git a/services/abilitymgr_lite/src/ability_service.cpp b/services/abilitymgr_lite/src/ability_service.cpp index 2fd14b92a06933c8bfcdd842ab9d6dbf89dbf06d..1bc25b7e4147a1e4c0b9378b0f8c77445fba97f6 100644 --- a/services/abilitymgr_lite/src/ability_service.cpp +++ b/services/abilitymgr_lite/src/ability_service.cpp @@ -79,10 +79,10 @@ void AbilityService::CleanWant() bool AbilityService::IsValidAbility(AbilityInfo *abilityInfo) { - if (abilityInfo == nullptr) { + if (!abilityInfo) { return false; } - if (abilityInfo->bundleName == nullptr || abilityInfo->srcPath == nullptr) { + if (!(abilityInfo->bundleName) || !(abilityInfo->srcPath)) { return false; } if (strlen(abilityInfo->bundleName) == 0 || strlen(abilityInfo->srcPath) == 0) { @@ -93,19 +93,19 @@ bool AbilityService::IsValidAbility(AbilityInfo *abilityInfo) int32_t AbilityService::StartAbility(const Want *want) { - if (want == nullptr || want->element == nullptr) { + if (!want || !(want->element)) { HILOG_ERROR(HILOG_MODULE_AAFWK, "Ability Service wanted element is null"); return PARAM_NULL_ERROR; } char *bundleName = want->element->bundleName; - if (bundleName == nullptr) { + if (!bundleName) { HILOG_ERROR(HILOG_MODULE_AAFWK, "Ability Service wanted bundleName is null"); return PARAM_NULL_ERROR; } AbilitySvcInfo *info = static_cast(AdapterMalloc(sizeof(AbilitySvcInfo))); - if (info == nullptr) { + if (!info) { HILOG_ERROR(HILOG_MODULE_AAFWK, "Ability Service AbilitySvcInfo is null"); return PARAM_NULL_ERROR; } @@ -148,11 +148,11 @@ int32_t AbilityService::StartAbility(const Want *want) void AbilityService::UpdataRecord(AbilitySvcInfo *info) { - if (info == nullptr) { + if (!info) { return; } AbilityRecord *record = abilityList_.Get(info->bundleName); - if (record == nullptr) { + if (!record) { return; } if (record->GetToken() != LAUNCHER_TOKEN) { @@ -163,13 +163,13 @@ void AbilityService::UpdataRecord(AbilitySvcInfo *info) int32_t AbilityService::StartAbility(AbilitySvcInfo *info) { - if ((info == nullptr) || (info->bundleName == nullptr) || (strlen(info->bundleName) == 0)) { + if (!info || !(info->bundleName) || (strlen(info->bundleName) == 0)) { return PARAM_NULL_ERROR; } HILOG_INFO(HILOG_MODULE_AAFWK, "StartAbility"); auto topRecord = abilityStack_.GetTopAbility(); - if ((topRecord == nullptr) || (topRecord->GetAppName() == nullptr)) { + if (!topRecord || !(topRecord->GetAppName())) { HILOG_ERROR(HILOG_MODULE_AAFWK, "StartAbility top null."); return PARAM_NULL_ERROR; } @@ -216,7 +216,7 @@ int32_t AbilityService::TerminateAbility(uint16_t token) { HILOG_INFO(HILOG_MODULE_AAFWK, "TerminateAbility [%{public}u]", token); AbilityRecord *topRecord = const_cast(abilityStack_.GetTopAbility()); - if (topRecord == nullptr) { + if (!topRecord) { APP_ERRCODE_EXTRA(EXCE_ACE_APP_START, EXCE_ACE_APP_STOP_NO_ABILITY_RUNNING); return PARAM_NULL_ERROR; } @@ -256,7 +256,7 @@ int32_t AbilityService::ForceStopBundle(uint16_t token) // active the launcher AbilityRecord *launcherRecord = abilityList_.Get(LAUNCHER_TOKEN); - if (launcherRecord == nullptr) { + if (!launcherRecord) { return PARAM_NULL_ERROR; } if (launcherRecord->GetState() != SCHEDULE_ACTIVE) { @@ -298,7 +298,7 @@ int32_t AbilityService::ForceStopBundleInner(uint16_t token) { // free js mem and delete the record AbilityRecord *record = abilityList_.Get(token); - if (record == nullptr) { + if (!record) { return PARAM_NULL_ERROR; } auto jsAppHost = const_cast(record->GetJsAppHost()); @@ -313,7 +313,7 @@ int32_t AbilityService::ForceStopBundleInner(uint16_t token) int32_t AbilityService::PreCheckStartAbility( const char *bundleName, const char *path, const void *data, uint16_t dataLength) { - if (path == nullptr) { + if (!path) { HILOG_ERROR(HILOG_MODULE_AAFWK, "PreCheckStartAbility path is null."); return PARAM_NULL_ERROR; } @@ -349,7 +349,7 @@ int32_t AbilityService::PreCheckStartAbility( bool AbilityService::CheckResponse(const char *bundleName) { StartCheckFunc callBackFunc = getAbilityCallback(); - if (callBackFunc == nullptr) { + if (!callBackFunc) { HILOG_ERROR(HILOG_MODULE_AAFWK, "calling ability callback failed: null"); return true; } @@ -363,7 +363,7 @@ bool AbilityService::CheckResponse(const char *bundleName) int32_t AbilityService::CreateAppTask(AbilityRecord *record) { - if ((record == nullptr) || (record->GetAppName() == nullptr)) { + if (!record || !(record->GetAppName())) { HILOG_ERROR(HILOG_MODULE_AAFWK, "CreateAppTask fail: null"); return PARAM_NULL_ERROR; } @@ -428,7 +428,7 @@ uint16_t AbilityService::GenerateToken() void AbilityService::DeleteRecordInfo(uint16_t token) { AbilityRecord *record = abilityList_.Get(token); - if (record == nullptr) { + if (!record) { return; } if (token != LAUNCHER_TOKEN) { @@ -459,7 +459,7 @@ void AbilityService::OnActiveDone(uint16_t token) HILOG_INFO(HILOG_MODULE_AAFWK, "OnActiveDone [%{public}u]", token); SetAbilityState(token, SCHEDULE_ACTIVE); auto topRecord = const_cast(abilityStack_.GetTopAbility()); - if (topRecord == nullptr) { + if (!topRecord) { return; } @@ -492,7 +492,7 @@ void AbilityService::OnBackgroundDone(uint16_t token) HILOG_INFO(HILOG_MODULE_AAFWK, "OnBackgroundDone [%{public}u]", token); SetAbilityState(token, SCHEDULE_BACKGROUND); auto topRecord = const_cast(abilityStack_.GetTopAbility()); - if (topRecord == nullptr) { + if (!topRecord) { return; } // the js background @@ -526,7 +526,7 @@ void AbilityService::OnDestroyDone(uint16_t token) return; } auto topRecord = abilityStack_.GetTopAbility(); - if ((topRecord == nullptr) || (topRecord->GetToken() != token)) { + if (!topRecord || (topRecord->GetToken() != token)) { SetAbilityState(token, SCHEDULE_STOP); DeleteRecordInfo(token); return; @@ -555,7 +555,7 @@ void AbilityService::OnDestroyDone(uint16_t token) int32_t AbilityService::SchedulerLifecycle(uint64_t token, int32_t state) { AbilityRecord *record = abilityList_.Get(token); - if (record == nullptr) { + if (!record) { return PARAM_NULL_ERROR; } return SchedulerLifecycleInner(record, state); @@ -564,7 +564,7 @@ int32_t AbilityService::SchedulerLifecycle(uint64_t token, int32_t state) void AbilityService::SetAbilityState(uint64_t token, int32_t state) { AbilityRecord *record = abilityList_.Get(token); - if (record == nullptr) { + if (!record) { return; } record->SetState((AbilityState) state); @@ -572,7 +572,7 @@ void AbilityService::SetAbilityState(uint64_t token, int32_t state) int32_t AbilityService::SchedulerLifecycleInner(const AbilityRecord *record, int32_t state) { - if (record == nullptr) { + if (!record) { return PARAM_NULL_ERROR; } // dispatch js life cycle @@ -581,12 +581,12 @@ int32_t AbilityService::SchedulerLifecycleInner(const AbilityRecord *record, int return ERR_OK; } // dispatch native life cycle - if (nativeAbility_ == nullptr) { + if (!nativeAbility_) { return PARAM_NULL_ERROR; } // malloc want memory and release after use Want *info = static_cast(AdapterMalloc(sizeof(Want))); - if (info == nullptr) { + if (!info) { return MEMORY_MALLOC_ERROR; } info->element = nullptr; @@ -605,7 +605,7 @@ int32_t AbilityService::SchedulerLifecycleInner(const AbilityRecord *record, int void AbilityService::SchedulerAbilityLifecycle(SliteAbility *ability, const Want &want, int32_t state) { - if (ability == nullptr) { + if (!ability) { return; } switch (state) { @@ -636,7 +636,7 @@ int32_t AbilityService::SchedulerLifecycleDone(uint64_t token, int32_t state) bool AbilityService::SendMsgToJsAbility(int32_t state, const AbilityRecord *record) { - if (record == nullptr) { + if (!record) { return false; } @@ -664,11 +664,11 @@ ElementName *AbilityService::GetTopAbility() { auto topRecord = const_cast(abilityStack_.GetTopAbility()); AbilityRecord *launcherRecord = abilityList_.Get(LAUNCHER_TOKEN); - if (topRecord == nullptr || launcherRecord == nullptr) { + if (!topRecord || !launcherRecord) { return nullptr; } ElementName *element = reinterpret_cast(AdapterMalloc(sizeof(ElementName))); - if (element == nullptr || memset_s(element, sizeof(ElementName), 0, sizeof(ElementName)) != EOK) { + if (!elementr || memset_s(element, sizeof(ElementName), 0, sizeof(ElementName)) != EOK) { AdapterFree(element); return nullptr; } diff --git a/services/abilitymgr_lite/src/ability_stack.cpp b/services/abilitymgr_lite/src/ability_stack.cpp index f78d0959dcd0f0193a0c7f9dd17950aa4de07f1c..fec1bdae378b4179038193697a80feaad7d0772d 100644 --- a/services/abilitymgr_lite/src/ability_stack.cpp +++ b/services/abilitymgr_lite/src/ability_stack.cpp @@ -37,7 +37,7 @@ int AbilityStack::GetAllAbilities(AbilityRecord **abilityRecords) auto ars = new AbilityRecord[size]; *abilityRecords = ars; for (auto node = abilityStack_.Begin(); node != abilityStack_.End(); node = node->next_) { - if (node->value_ == nullptr) { + if (!(node->value_)) { continue; } AbilityRecord::CopyAbilityRecord(*(node->value_), *ars); diff --git a/services/abilitymgr_lite/src/ability_stack_manager.cpp b/services/abilitymgr_lite/src/ability_stack_manager.cpp index 43190e56d249acbfe8bffd0afbe9ef92c5665e69..1f72e6904d0f401d2e0bb4784d2422e79f8835d5 100644 --- a/services/abilitymgr_lite/src/ability_stack_manager.cpp +++ b/services/abilitymgr_lite/src/ability_stack_manager.cpp @@ -29,12 +29,12 @@ PageAbilityRecord *AbilityStackManager::GeneratePageAbility(const AbilityInfo &t AbilityMissionRecord *targetMission = stack->GetTargetMissionRecord(target.bundleName); auto topMissionRecord = stack->GetTopMissionRecord(); /* launcher -> default or default -> launcher */ - if (topAbility == nullptr || AbilityMsHelper::IsAceAbility(target.name) || + if (!topAbility || AbilityMsHelper::IsAceAbility(target.name) || (!topAbility->IsLauncherAbility() && AbilityMsHelper::IsLauncherAbility(target.bundleName)) || (topAbility->IsLauncherAbility() && !AbilityMsHelper::IsLauncherAbility(target.bundleName))) { // Get the mission record of the current bundleName PRINTD("AbilityStackManager", "launcher jumps to default or default jumps to launcher"); - if (targetMission == nullptr) { + if (!targetMission) { targetMission = new AbilityMissionRecord(stack, target.bundleName); targetAbility = new PageAbilityRecord(target, want); targetMission->PushPageAbility(*targetAbility); @@ -45,7 +45,7 @@ PageAbilityRecord *AbilityStackManager::GeneratePageAbility(const AbilityInfo &t } } else { PRINTD("AbilityStackManager", "default application jumps to another default"); - if (targetMission == nullptr) { + if (!targetMission) { targetMission = new AbilityMissionRecord(stack, target.bundleName); stack->PushTopMissionRecord(*targetMission); targetAbility = new PageAbilityRecord(target, want); @@ -146,7 +146,7 @@ PageAbilityRecord *AbilityStackManager::FindPageAbility(const AbilityMgrContext } // find service ability - if (record == nullptr) { + if (!record) { auto serviceConnects = amsContext.GetServiceConnects(); if (serviceConnects != nullptr) { record = serviceConnects->FindServiceRecord(token); @@ -193,7 +193,7 @@ const PageAbilityRecord *AbilityStackManager::GetPrevPageAbility(const AbilityMg bool AbilityStackManager::ExistAppInStack(const AbilityInfo &target, AbilityMgrContext &amsContext) const { auto stack = amsContext.GetTargetMissionStack(target.bundleName); - if (stack == nullptr) { + if (!stack) { return false; } AbilityMissionRecord *targetMission = stack->GetTargetMissionRecord(target.bundleName); diff --git a/services/abilitymgr_lite/src/ability_worker.cpp b/services/abilitymgr_lite/src/ability_worker.cpp index 99bd700d977c642c2d4d2c19a34bef62c1923a29..d43555226d06be083e32dad85121e47f2c3996e4 100644 --- a/services/abilitymgr_lite/src/ability_worker.cpp +++ b/services/abilitymgr_lite/src/ability_worker.cpp @@ -124,20 +124,20 @@ AbilityMsStatus AbilityWorker::ConnectAbility(const AbilityConnectTransParam &co if (!AbilityMsHelper::CheckVisiblePermission(connectParam.GetCallingUid(), bundleInfo.uid, target.isVisible)) { return AbilityMsStatus::PermissionStatus("connect ability visibale is false"); } - if (abilityMgrContext_ == nullptr) { + if (!abilityMgrContext_) { return AbilityMsStatus::TaskStatus("connect", "invalid argument"); } auto serviceConnects = abilityMgrContext_->GetServiceConnects(); - if (serviceConnects == nullptr) { + if (!serviceConnects) { return AbilityMsStatus::TaskStatus("connect", "invalid argument"); } - if (connectParam.GetWant() == nullptr || connectParam.GetWant()->element == nullptr) { + if (!(connectParam.GetWant()) || !(connectParam.GetWant()->element)) { return AbilityMsStatus::TaskStatus("connect", "invalid argument"); } char *bundleName = connectParam.GetWant()->element->bundleName; char *abilityName = connectParam.GetWant()->element->abilityName; auto abilityRecord = serviceConnects->FindServiceRecord(bundleName, abilityName); - if (abilityRecord == nullptr) { + if (!abilityRecord) { PRINTD("AbilityWorker", "ability start first"); AbilityStartTask startTask(abilityMgrContext_, connectParam.GetWant(), &target, &bundleInfo); startTask.SetWaitConnect(true); @@ -149,7 +149,7 @@ AbilityMsStatus AbilityWorker::ConnectAbility(const AbilityConnectTransParam &co PRINTD("AbilityWorker", "ability has started"); } abilityRecord = serviceConnects->FindServiceRecord(bundleName, abilityName); - if (abilityRecord == nullptr) { + if (!abilityRecord) { return AbilityMsStatus::TaskStatus("connect", "generate ability record failure"); } AbilityConnectTask connectTask(abilityMgrContext_, *connectParam.GetWant(), diff --git a/services/abilitymgr_lite/src/app_manager.cpp b/services/abilitymgr_lite/src/app_manager.cpp index ce5bda3f18ef71d5faf57c130ea5ff41558d2b78..24759c3146550d6ec54776a6e24454cb72f8b069 100644 --- a/services/abilitymgr_lite/src/app_manager.cpp +++ b/services/abilitymgr_lite/src/app_manager.cpp @@ -63,7 +63,7 @@ void AppManager::RemoveAppRecord(const AppRecord &appRecord) AbilityMsStatus AppManager::TerminateAppProcess(const char *bundleName) { AppRecord *current = GetAppRecordByBundleName(bundleName); - if (current == nullptr) { + if (!current) { PRINTI("AppManager", "app record is not find"); return AbilityMsStatus::Ok(); } diff --git a/services/abilitymgr_lite/src/client/ability_dump_client.cpp b/services/abilitymgr_lite/src/client/ability_dump_client.cpp index 6527feb336cf2b859841b850e8454fb299eb8262..8537e7c7638497110de52aeb1cc56662ff922b66 100644 --- a/services/abilitymgr_lite/src/client/ability_dump_client.cpp +++ b/services/abilitymgr_lite/src/client/ability_dump_client.cpp @@ -45,11 +45,11 @@ const Want &AbilityDumpClient::GetWant() const AbilityMsStatus AbilityDumpClient::AbilityDumpTransaction(const char *info) const { - if (want_.sid == nullptr) { + if (!(want_.sid)) { return AbilityMsStatus::DumpStatus("null SvcIdentity"); } PRINTD("AbilityThreadClient", "start"); - if (info == nullptr) { + if (!info) { info = ""; } IpcIo req; diff --git a/services/abilitymgr_lite/src/client/ability_thread_client.cpp b/services/abilitymgr_lite/src/client/ability_thread_client.cpp index 5f7ee7cff363085c30904cfda35877206f8d6546..e052e69fd228c135106d8bc56edb4aa8cb83c9b4 100644 --- a/services/abilitymgr_lite/src/client/ability_thread_client.cpp +++ b/services/abilitymgr_lite/src/client/ability_thread_client.cpp @@ -50,12 +50,12 @@ AbilityThreadClient::~AbilityThreadClient() AbilityMsStatus AbilityThreadClient::Initialize(const char *bundleName) { - if (bundleName == nullptr) { + if (!bundleName) { return AbilityMsStatus::AppTransanctStatus("bundleName is null"); } AppInfo *appInfo = new AppInfo(); appInfo->bundleName = Utils::Strdup(bundleName); - if (appInfo->bundleName == nullptr) { + if (!(appInfo->bundleName)) { delete appInfo; return AbilityMsStatus::AppTransanctStatus("memory alloc fail"); } @@ -109,7 +109,7 @@ AbilityMsStatus AbilityThreadClient::AbilityTransaction(const TransactionState & AbilityMsStatus AbilityThreadClient::AppInitTransaction(const BundleInfo &bundleInfo) { PRINTD("AbilityThreadClient", "start"); - if (bundleInfo.bundleName == nullptr || bundleInfo.codePath == nullptr || + if (!(bundleInfo.bundleName) || !(bundleInfo.codePath) || bundleInfo.numOfModule > MAX_MODULE_SIZE) { return AbilityMsStatus::AppTransanctStatus("app init invalid argument"); } diff --git a/services/abilitymgr_lite/src/client/app_spawn_client.cpp b/services/abilitymgr_lite/src/client/app_spawn_client.cpp index bbfabf042998c7a473268c3ad615628e1327c08e..7b34bc4278280fe634c7218d746e60c0c6331eec 100644 --- a/services/abilitymgr_lite/src/client/app_spawn_client.cpp +++ b/services/abilitymgr_lite/src/client/app_spawn_client.cpp @@ -29,7 +29,7 @@ const int RETRY_TIMES_MAX = 30; static int Notify(IOwner owner, int code, IpcIo *reply) { - if (reply == nullptr || owner == nullptr) { + if (!reply || !owner) { return EC_INVALID; } int64_t *result = reinterpret_cast(owner); @@ -39,15 +39,15 @@ static int Notify(IOwner owner, int code, IpcIo *reply) AbilityMsStatus AppSpawnClient::Initialize() { - while (spawnClient_ == nullptr) { + while (!spawnClient_) { IUnknown *iUnknown = SAMGR_GetInstance()->GetDefaultFeatureApi(APPSPAWN_SERVICE_NAME); - if (iUnknown == nullptr) { + if (!iUnknown) { PRINTW("AppSpawnClient", "get default feature api fail, again try"); usleep(SLEEP_TIMES); // sleep 200ms continue; } int result = iUnknown->QueryInterface(iUnknown, CLIENT_PROXY_VER, (void **)(&spawnClient_)); - if (result != EC_SUCCESS || spawnClient_ == nullptr) { + if (result != EC_SUCCESS || !spawnClient_) { PRINTW("AppSpawnClient", "get app spawn client fail"); usleep(SLEEP_TIMES); // sleep 200ms continue; @@ -65,10 +65,10 @@ static void InnerFreeDataBuff(void *ptr) AbilityMsStatus AppSpawnClient::CallingInnerSpawnProcess(char *spawnMessage, AppRecord &appRecord) { - if (spawnMessage == nullptr) { + if (!spawnMessage) { return AbilityMsStatus::ProcessStatus("CallingInnerSpawnProcess spawnMessage is nullptr"); } - if (spawnClient_ == nullptr) { + if (!spawnClient_) { AbilityMsStatus status = Initialize(); if (!status.IsOk()) { cJSON_free(spawnMessage); @@ -108,12 +108,12 @@ AbilityMsStatus AppSpawnClient::CallingInnerSpawnProcess(char *spawnMessage, App AbilityMsStatus AppSpawnClient::SpawnProcess(AppRecord &appRecord) { char *innerBundleName = appRecord.GetBundleInfo().bundleName; - if (innerBundleName == nullptr) { + if (!innerBundleName) { return AbilityMsStatus::ProcessStatus("invalid argument"); } cJSON *root = cJSON_CreateObject(); - if (root == nullptr) { + if (!root) { return AbilityMsStatus::ProcessStatus("SpawnProcess create fail"); } cJSON_AddStringToObject(root, "bundleName", innerBundleName); @@ -123,7 +123,7 @@ AbilityMsStatus AppSpawnClient::SpawnProcess(AppRecord &appRecord) cJSON_AddNumberToObject(root, "gID", appRecord.GetBundleInfo().gid); cJSON *caps = cJSON_AddArrayToObject(root, "capability"); - if (caps == nullptr) { + if (!caps) { cJSON_Delete(root); return AbilityMsStatus::ProcessStatus("SpawnProcess create array unsuccessfully"); } @@ -138,7 +138,7 @@ AbilityMsStatus AppSpawnClient::SpawnProcess(AppRecord &appRecord) if ((capabilities != nullptr) && (capNums != 0)) { for (int32_t i = 0; i < capNums; ++i) { cJSON *item = cJSON_CreateNumber(capabilities[i]); - if ((item == nullptr) || !cJSON_AddItemToArray(caps, item)) { + if (!item || !cJSON_AddItemToArray(caps, item)) { free(capabilities); capabilities = nullptr; cJSON_Delete(item); diff --git a/services/abilitymgr_lite/src/client/bundlems_client.cpp b/services/abilitymgr_lite/src/client/bundlems_client.cpp index c0a27101768cf18a1229ac27f9d55931d30f174a..1fd80dadd0e23a85107c2ce5c35d4a76c25c25f5 100644 --- a/services/abilitymgr_lite/src/client/bundlems_client.cpp +++ b/services/abilitymgr_lite/src/client/bundlems_client.cpp @@ -27,11 +27,11 @@ BundleMsClient::~BundleMsClient() AbilityMsStatus BundleMsClient::Initialize() { IUnknown *iUnknown = SAMGR_GetInstance()->GetFeatureApi(BMS_SERVICE, BMS_FEATURE); - if (iUnknown == nullptr) { + if (!iUnknown) { return AbilityMsStatus::BmsQueryStatus("get bms feature api failure"); } int result = iUnknown->QueryInterface(iUnknown, DEFAULT_VERSION, (void **) &bmsServerProxy_); - if (result != 0 || bmsServerProxy_ == nullptr) { + if (result != 0 || !bmsServerProxy_) { return AbilityMsStatus::BmsQueryStatus("get bms interface failure"); } return AbilityMsStatus::Ok(); @@ -39,7 +39,7 @@ AbilityMsStatus BundleMsClient::Initialize() AbilityMsStatus BundleMsClient::QueryAbilityInfo(const Want *want, AbilityInfo *result) const { - if (bmsServerProxy_ == nullptr) { + if (!bmsServerProxy_) { return AbilityMsStatus::BmsQueryStatus("bms server proxy is nullptr"); } if (bmsServerProxy_->QueryAbilityInfo(want, result) != ERR_OK) { @@ -51,7 +51,7 @@ AbilityMsStatus BundleMsClient::QueryAbilityInfo(const Want *want, AbilityInfo * AbilityMsStatus BundleMsClient::QueryBundleInfo(const char* bundleName, BundleInfo *bundleInfo) const { - if (bmsServerProxy_ == nullptr) { + if (!bmsServerProxy_) { return AbilityMsStatus::BmsQueryStatus("bms service proxy is nullptr"); } if (bmsServerProxy_->GetBundleInfo(bundleName, 1, bundleInfo) != ERR_OK) { @@ -62,7 +62,7 @@ AbilityMsStatus BundleMsClient::QueryBundleInfo(const char* bundleName, BundleIn AbilityMsStatus BundleMsClient::QueryKeepAliveBundleInfos(BundleInfo **bundleInfos, int32_t *len) const { - if (bmsServerProxy_ == nullptr) { + if (!bmsServerProxy_) { return AbilityMsStatus::BmsQueryStatus("bms service proxy is nullptr"); } if (bmsServerProxy_->QueryKeepAliveBundleInfos(bundleInfos, len) != ERR_OK) { diff --git a/services/abilitymgr_lite/src/client/wms_client.cpp b/services/abilitymgr_lite/src/client/wms_client.cpp index 1e5c16daca70ce7fa9a818143f2dd235c82cecfe..8a7ccf1c6a627398526c2c8860a59068f4d80573 100755 --- a/services/abilitymgr_lite/src/client/wms_client.cpp +++ b/services/abilitymgr_lite/src/client/wms_client.cpp @@ -34,14 +34,14 @@ void WMSClient::WaitUntilWmsReady() { PRINTI("WMSClient", "wait for window manager service start"); IClientProxy *wmsProxy = nullptr; - while (wmsProxy == nullptr) { + while (!wmsProxy) { IUnknown *iUnknown = SAMGR_GetInstance()->GetDefaultFeatureApi(SERVICE_NAME); - if (iUnknown == nullptr) { + if (!iUnknown) { usleep(RETRY_SLEEP_TIMES); continue; } int result = iUnknown->QueryInterface(iUnknown, CLIENT_PROXY_VER, (void **)(&wmsProxy)); - if (result != EC_SUCCESS || wmsProxy == nullptr) { + if (result != EC_SUCCESS || !wmsProxy) { usleep(RETRY_SLEEP_TIMES); continue; } diff --git a/services/abilitymgr_lite/src/js_app_host.cpp b/services/abilitymgr_lite/src/js_app_host.cpp index 54dd6280bf1d68617a7496c64b4307e39dc9b905..1083e48178052d50c6859f7b9edd730149b5a1dd 100755 --- a/services/abilitymgr_lite/src/js_app_host.cpp +++ b/services/abilitymgr_lite/src/js_app_host.cpp @@ -37,12 +37,12 @@ JsAppHost::~JsAppHost() void JsAppHost::JsAppTaskHandler(uint32_t uwArg) { auto jsappHost = reinterpret_cast((uintptr_t)uwArg); - if (jsappHost == nullptr) { + if (!jsappHost) { return; } osMessageQueueId_t appQueueId = jsappHost->GetMessageQueueId(); - if (appQueueId == nullptr) { + if (!appQueueId) { return; } @@ -87,9 +87,9 @@ void JsAppHost::JsAppTaskHandler(uint32_t uwArg) void JsAppHost::OnActive(uint16_t token, const char *bundleName, const char *path) { - if (jsAbility_ == nullptr) { + if (!jsAbility_) { jsAbility_ = new ACELite::JSAbility(); - if (jsAbility_ == nullptr) { + if (!jsAbility_) { return; } jsAbility_->Launch(const_cast(path), bundleName, token); diff --git a/services/abilitymgr_lite/src/page_ability_record.cpp b/services/abilitymgr_lite/src/page_ability_record.cpp index 3673af170f74048b5e38dcb471c5560959f4003d..bae0bf1d19f81a8d1bb27367aa30e65a2fe5e95f 100644 --- a/services/abilitymgr_lite/src/page_ability_record.cpp +++ b/services/abilitymgr_lite/src/page_ability_record.cpp @@ -93,10 +93,10 @@ bool PageAbilityRecord::IsSamePageAbility(const PageAbilityRecord &target) const bool PageAbilityRecord::IsSamePageAbility(const Want &want) const { - if (want.element == nullptr || want.element->bundleName == nullptr || want.element->abilityName == nullptr) { + if (!(want.element) || !(want.element->bundleName) || !(want.element->abilityName)) { return false; } - if (abilityInfo_.bundleName == nullptr || abilityInfo_.name == nullptr) { + if (!(abilityInfo_.bundleName) || !(abilityInfo_.name)) { return false; } if (strcmp(abilityInfo_.bundleName, want.element->bundleName) == 0 && @@ -108,7 +108,7 @@ bool PageAbilityRecord::IsSamePageAbility(const Want &want) const bool PageAbilityRecord::IsSamePageAbility(const char *bundleName) const { - if (bundleName == nullptr || abilityInfo_.bundleName == nullptr) { + if (!bundleName || !(abilityInfo_.bundleName)) { return false; } return strcmp(bundleName, abilityInfo_.bundleName) == 0; @@ -246,10 +246,10 @@ bool PageAbilityRecord::IsLauncherAbility() const AbilityMsStatus PageAbilityRecord::StartAbility() { - if (appRecord_ == nullptr) { + if (!appRecord_) { // If process is not exist, start process. appRecord_ = AppManager::GetInstance().StartAppProcess(bundleInfo_); - if (appRecord_ == nullptr) { + if (!appRecord_) { return AbilityMsStatus::ProcessStatus("start app process fail"); } appRecord_->SetPendingAbility(this); @@ -260,10 +260,10 @@ AbilityMsStatus PageAbilityRecord::StartAbility() AbilityMsStatus PageAbilityRecord::StartService() { - if (appRecord_ == nullptr) { + if (!appRecord_) { // If process is not exist, start process. appRecord_ = AppManager::GetInstance().StartAppProcess(bundleInfo_); - if (appRecord_ == nullptr) { + if (!appRecord_) { return AbilityMsStatus::ProcessStatus("start app process fail"); } appRecord_->SetPendingAbility(this); @@ -277,7 +277,7 @@ AbilityMsStatus PageAbilityRecord::ActiveAbility() if (currentState_ == STATE_ACTIVE) { return AbilityMsStatus::LifeCycleStatus("current state is already active when active"); } - if (appRecord_ == nullptr) { + if (!appRecord_) { return AbilityMsStatus::AppTransanctStatus("app record not exsit"); } TransactionState state = {token_, STATE_ACTIVE}; @@ -291,7 +291,7 @@ AbilityMsStatus PageAbilityRecord::InactiveAbility() const if (currentState_ != STATE_ACTIVE && abilityInfo_.abilityType != AbilityType::SERVICE) { return AbilityMsStatus::LifeCycleStatus("current state is not active when inactive"); } - if (appRecord_ == nullptr) { + if (!appRecord_) { return AbilityMsStatus::AppTransanctStatus("app record not exsit"); } TransactionState state = {token_, STATE_INACTIVE}; @@ -303,7 +303,7 @@ AbilityMsStatus PageAbilityRecord::ToBackgroundAbility() const if (currentState_ != STATE_INACTIVE) { return AbilityMsStatus::LifeCycleStatus("current state is not inactive when background"); } - if (appRecord_ == nullptr) { + if (!appRecord_) { return AbilityMsStatus::AppTransanctStatus("app record not exsit"); } TransactionState state = {token_, STATE_BACKGROUND}; @@ -315,7 +315,7 @@ AbilityMsStatus PageAbilityRecord::StopAbility() const if (currentState_ != STATE_INACTIVE) { return AbilityMsStatus::LifeCycleStatus("current state is not inactive when stop"); } - if (appRecord_ == nullptr) { + if (!appRecord_) { return AbilityMsStatus::AppTransanctStatus("app record not exsit"); } TransactionState state = {token_, STATE_INITIAL}; @@ -324,7 +324,7 @@ AbilityMsStatus PageAbilityRecord::StopAbility() const AbilityMsStatus PageAbilityRecord::ExitApp() { - if (appRecord_ == nullptr) { + if (!appRecord_) { return AbilityMsStatus::AppTransanctStatus("app record not exsit"); } AbilityMsStatus status = appRecord_->AppExitTransaction(); @@ -337,7 +337,7 @@ AbilityMsStatus PageAbilityRecord::ExitApp() AbilityMsStatus PageAbilityRecord::ConnectAbility() { - if (appRecord_ == nullptr) { + if (!appRecord_) { return AbilityMsStatus::TaskStatus("connectAbility, ", "app record not exsit"); } return appRecord_->ConnectTransaction(want_, token_); @@ -345,7 +345,7 @@ AbilityMsStatus PageAbilityRecord::ConnectAbility() AbilityMsStatus PageAbilityRecord::DisconnectAbility(const SvcIdentity &connectSid) { - if (appRecord_ == nullptr) { + if (!appRecord_) { return AbilityMsStatus::TaskStatus("disconnectAbility, ", "app record not exsit"); } RemoveConnectRecord(connectSid); @@ -367,7 +367,7 @@ AbilityMsStatus PageAbilityRecord::DisconnectAbility(const SvcIdentity &connectS AbilityMsStatus PageAbilityRecord::ConnectAbilityDone() { - if (appRecord_ == nullptr) { + if (!appRecord_) { return AbilityMsStatus::TaskStatus("connectAbilityDone, ", "app record not exsit"); } for (auto record : connectRecords_) { @@ -381,7 +381,7 @@ AbilityMsStatus PageAbilityRecord::ConnectAbilityDone() AbilityMsStatus PageAbilityRecord::DisconnectAbilityDone() { - if (appRecord_ == nullptr) { + if (!appRecord_) { return AbilityMsStatus::TaskStatus("disconnectAbilityDone, ", "app record not exsit"); } if (startDone_) { @@ -399,7 +399,7 @@ AbilityMsStatus PageAbilityRecord::DisconnectAbilityDone() AbilityMsStatus PageAbilityRecord::ForceStopServiceAbility() { - if (appRecord_ == nullptr) { + if (!appRecord_) { return AbilityMsStatus::TaskStatus("terminateService, ", "app record not exsit"); } forceStop_ = true; @@ -421,7 +421,7 @@ AbilityMsStatus PageAbilityRecord::ForceStopServiceAbility() AbilityMsStatus PageAbilityRecord::StopAbilityDone() { - if (appRecord_ == nullptr) { + if (!appRecord_) { return AbilityMsStatus::TaskStatus("disconnectAbilityDone, ", "app record not exsit"); } SetConnectStatus(ConnectStatus::STOPPED); @@ -447,7 +447,7 @@ AbilityMsStatus PageAbilityRecord::DumpAbilityRecord() const AbilityMsStatus PageAbilityRecord::DumpAbilitySlice(const Want &want) const { - if (appRecord_ == nullptr) { + if (!appRecord_) { return AbilityMsStatus::TaskStatus("DumpAbility, ", "app record not exsit"); } return appRecord_->DumpAbilityTransaction(want, token_); diff --git a/services/abilitymgr_lite/src/task/ability_activate_task.cpp b/services/abilitymgr_lite/src/task/ability_activate_task.cpp index 8b498bf89b00c2223924894c069e4257f721ce97..8b14569817b7f0744c5ec5ee43f6d4fb84d92cb4 100644 --- a/services/abilitymgr_lite/src/task/ability_activate_task.cpp +++ b/services/abilitymgr_lite/src/task/ability_activate_task.cpp @@ -24,12 +24,12 @@ AbilityActivateTask::AbilityActivateTask(AbilityMgrContext *context, uint64_t to AbilityMsStatus AbilityActivateTask::Execute() { PRINTD("AbilityActivateTask", "start"); - if (abilityMgrContext_ == nullptr) { + if (!abilityMgrContext_) { return AbilityMsStatus::TaskStatus("activate", "invalid argument"); } AbilityStackManager &stackManager = AbilityStackManager::GetInstance(); PageAbilityRecord *activeAbility = stackManager.FindPageAbility(*abilityMgrContext_, token_); - if (activeAbility == nullptr) { + if (!activeAbility) { return AbilityMsStatus::TaskStatus("activate", "ability record not found"); } activeAbility->SetCurrentState(STATE_ACTIVE); diff --git a/services/abilitymgr_lite/src/task/ability_attach_task.cpp b/services/abilitymgr_lite/src/task/ability_attach_task.cpp index 34461b7e9806d96fc4a5877ec33b4b528871fa7b..693ea02145592645af1110ac570596c3f0e88ee8 100644 --- a/services/abilitymgr_lite/src/task/ability_attach_task.cpp +++ b/services/abilitymgr_lite/src/task/ability_attach_task.cpp @@ -31,13 +31,13 @@ AbilityAttachTask::~AbilityAttachTask() AbilityMsStatus AbilityAttachTask::Execute() { PRINTD("AbilityAttachTask", "start"); - if (client_ == nullptr) { + if (!client_) { return AbilityMsStatus::TaskStatus("Attach", "invalid argument"); } // step1: Get app record by token. auto appRecord = const_cast(AppManager::GetInstance().GetAppRecordByToken( client_->GetToken(), client_->GetPid())); - if (appRecord == nullptr) { + if (!appRecord) { return AbilityMsStatus::TaskStatus("Attach", "appRecord not found"); } // step2: Save ability thread client. diff --git a/services/abilitymgr_lite/src/task/ability_background_task.cpp b/services/abilitymgr_lite/src/task/ability_background_task.cpp index c880e7ae1067853a13be881b3d8d5dd941256584..95b7339195ad86575714ad1e968ef2d587ad7f72 100644 --- a/services/abilitymgr_lite/src/task/ability_background_task.cpp +++ b/services/abilitymgr_lite/src/task/ability_background_task.cpp @@ -24,12 +24,12 @@ AbilityBackgroundTask::AbilityBackgroundTask(AbilityMgrContext *context, uint64_ AbilityMsStatus AbilityBackgroundTask::Execute() { PRINTD("AbilityBackgroundTask", "start"); - if (abilityMgrContext_ == nullptr) { + if (!abilityMgrContext_) { return AbilityMsStatus::TaskStatus("background", "invalid argument"); } AbilityStackManager &stackManager = AbilityStackManager::GetInstance(); PageAbilityRecord *backgroundAbility = stackManager.FindPageAbility(*abilityMgrContext_, token_); - if (backgroundAbility == nullptr) { + if (!backgroundAbility) { return AbilityMsStatus::TaskStatus("background", "ability record not find"); } backgroundAbility->SetCurrentState(STATE_BACKGROUND); diff --git a/services/abilitymgr_lite/src/task/ability_connect_done_task.cpp b/services/abilitymgr_lite/src/task/ability_connect_done_task.cpp index 19a740cd6004621ad40c81882ceb0ae37e3ef23d..71275479bbc77bb236d85378cd50423b4938a31e 100644 --- a/services/abilitymgr_lite/src/task/ability_connect_done_task.cpp +++ b/services/abilitymgr_lite/src/task/ability_connect_done_task.cpp @@ -24,12 +24,12 @@ AbilityConnectDoneTask::AbilityConnectDoneTask(AbilityMgrContext *context, const AbilityMsStatus AbilityConnectDoneTask::Execute() { PRINTD("AbilityConnectDoneTask", "start"); - if (abilityMgrContext_ == nullptr) { + if (!abilityMgrContext_) { return AbilityMsStatus::TaskStatus("connectTaskDone", "invalid argument"); } AbilityStackManager &stackManager = AbilityStackManager::GetInstance(); PageAbilityRecord *service = stackManager.FindServiceAbility(*abilityMgrContext_, token_); - if (service == nullptr) { + if (!service) { return AbilityMsStatus::TaskStatus("connectTaskDone", "service ability dose not exists"); } if (service->IsPerformStop()) { diff --git a/services/abilitymgr_lite/src/task/ability_connect_task.cpp b/services/abilitymgr_lite/src/task/ability_connect_task.cpp index a02b98980d4ad17fd77093f8c3f2278d4db7bdc9..8706d7c096d24473bf9d156081bb6196238e2b98 100644 --- a/services/abilitymgr_lite/src/task/ability_connect_task.cpp +++ b/services/abilitymgr_lite/src/task/ability_connect_task.cpp @@ -27,13 +27,13 @@ AbilityConnectTask::AbilityConnectTask(AbilityMgrContext *context, const Want &w AbilityMsStatus AbilityConnectTask::Execute() { PRINTD("AbilityConnectTask", "start"); - if (abilityMgrContext_ == nullptr || want_.element == nullptr) { + if (!abilityMgrContext_ || !want_.element) { return AbilityMsStatus::TaskStatus("connectTask", "invalid argument"); } AbilityStackManager &stackManager = AbilityStackManager::GetInstance(); PageAbilityRecord *service = stackManager.FindServiceAbility(*abilityMgrContext_, want_.element->bundleName, want_.element->abilityName); - if (service == nullptr) { + if (!service) { return AbilityMsStatus::TaskStatus("connectTask", "service ability does not exists"); } if (service->IsPerformStop()) { @@ -51,7 +51,7 @@ AbilityMsStatus AbilityConnectTask::PerformConnectTask(PageAbilityRecord *servic return AbilityMsStatus::TaskStatus("AbilityConnectTask", "service status has disconnected"); } auto connectRecord = service->GetConnectRecord(connectSid_); - if (connectRecord == nullptr) { + if (!connectRecord) { connectRecord = new AbilityConnectRecord(connectSid_, token_); connectRecord->SetStatus(ConnectStatus::CONNECTING); service->pushConnectRecord(connectRecord); diff --git a/services/abilitymgr_lite/src/task/ability_disconnect_done_task.cpp b/services/abilitymgr_lite/src/task/ability_disconnect_done_task.cpp index f09505028810552a3f28b32dcf94976cab6843da..0629a6cd2a0b016f079f8350f815e1626f02364c 100644 --- a/services/abilitymgr_lite/src/task/ability_disconnect_done_task.cpp +++ b/services/abilitymgr_lite/src/task/ability_disconnect_done_task.cpp @@ -24,12 +24,12 @@ AbilityDisconnectDoneTask::AbilityDisconnectDoneTask(AbilityMgrContext *context, AbilityMsStatus AbilityDisconnectDoneTask::Execute() { PRINTD("AbilityDisconnectDoneTask", "start"); - if (abilityMgrContext_ == nullptr) { + if (!abilityMgrContext_) { return AbilityMsStatus::TaskStatus("disconnectTaskDone", "invalid argument"); } AbilityStackManager &stackManager = AbilityStackManager::GetInstance(); PageAbilityRecord *service = stackManager.FindServiceAbility(*abilityMgrContext_, token_); - if (service == nullptr) { + if (!service) { return AbilityMsStatus::TaskStatus("disconnectTaskDone", "service ability does not exists"); } if (service->IsPerformStop()) { diff --git a/services/abilitymgr_lite/src/task/ability_disconnect_task.cpp b/services/abilitymgr_lite/src/task/ability_disconnect_task.cpp index 34e89c3658342c29ce29d1816865b6b1f2ea41ca..eb46b686d0de69149df269b8ba4a6e21a831d5f9 100644 --- a/services/abilitymgr_lite/src/task/ability_disconnect_task.cpp +++ b/services/abilitymgr_lite/src/task/ability_disconnect_task.cpp @@ -24,15 +24,15 @@ AbilityDisconnectTask::AbilityDisconnectTask(AbilityMgrContext *context, const S AbilityMsStatus AbilityDisconnectTask::Execute() { PRINTD("AbilityDisconnectTask", "start"); - if (abilityMgrContext_ == nullptr) { + if (!abilityMgrContext_) { return AbilityMsStatus::TaskStatus("disconnectTask", "invalid argument"); } auto serviceConnects = abilityMgrContext_->GetServiceConnects(); - if (serviceConnects == nullptr) { + if (!serviceConnects) { return AbilityMsStatus::TaskStatus("disconnectTask", "invalid argument"); } auto service = serviceConnects->FindServiceRecord(identity_, token_); - if (service == nullptr) { + if (!service) { return AbilityMsStatus::TaskStatus("disconnectTask", "service is not exists"); } return service->DisconnectAbility(identity_); diff --git a/services/abilitymgr_lite/src/task/ability_dump_task.cpp b/services/abilitymgr_lite/src/task/ability_dump_task.cpp index 5a0e7cf093d954ce73d44ce93359591907015e03..69e42ab69bb67b6e51327470bb5d3f6e0de15459 100644 --- a/services/abilitymgr_lite/src/task/ability_dump_task.cpp +++ b/services/abilitymgr_lite/src/task/ability_dump_task.cpp @@ -24,7 +24,7 @@ AbilityDumpTask::AbilityDumpTask(AbilityMgrContext *context, const AbilityDumpCl AbilityMsStatus AbilityDumpTask::Execute() { PRINTD("AbilityDumpTask", "start"); - if (abilityMgrContext_ == nullptr || client_ == nullptr) { + if (!abilityMgrContext_ || !client_) { return AbilityMsStatus::TaskStatus("dump", "invalid argument"); } AbilityStackManager &stackManager = AbilityStackManager::GetInstance(); @@ -32,7 +32,7 @@ AbilityMsStatus AbilityDumpTask::Execute() // If query target ability const PageAbilityRecord *targetAbility = stackManager.FindPageAbility(*abilityMgrContext_, client_->GetWant()); - if (targetAbility == nullptr) { + if (!targetAbility) { return client_->AbilityDumpTransaction("Ability not found\n"); } return targetAbility->DumpAbilitySlice(client_->GetWant()); diff --git a/services/abilitymgr_lite/src/task/ability_inactivate_task.cpp b/services/abilitymgr_lite/src/task/ability_inactivate_task.cpp index 7703682aa7ac3aefeef64905cddf8e8695f484f0..5ee8adb6e5b9cdd91fe73e3131908ea812e60934 100644 --- a/services/abilitymgr_lite/src/task/ability_inactivate_task.cpp +++ b/services/abilitymgr_lite/src/task/ability_inactivate_task.cpp @@ -24,12 +24,12 @@ AbilityInactivateTask::AbilityInactivateTask(AbilityMgrContext *context, uint64_ AbilityMsStatus AbilityInactivateTask::Execute() { PRINTD("AbilityInactivateTask", "start"); - if (abilityMgrContext_ == nullptr) { + if (!abilityMgrContext_) { return AbilityMsStatus::TaskStatus("inactivate", "invalid argument"); } AbilityStackManager &stackManager = AbilityStackManager::GetInstance(); PageAbilityRecord *inactiveAbility = stackManager.FindPageAbility(*abilityMgrContext_, token_); - if (inactiveAbility == nullptr) { + if (!inactiveAbility) { return AbilityMsStatus::TaskStatus("inactivate", "ability record not found"); } inactiveAbility->SetCurrentState(STATE_INACTIVE); diff --git a/services/abilitymgr_lite/src/task/ability_start_task.cpp b/services/abilitymgr_lite/src/task/ability_start_task.cpp index 0062b0f843bea4336d895cab7a6d1b769f1b2423..e737a6bfbd93e2fe0a7aaaf68d0ab7196630f350 100644 --- a/services/abilitymgr_lite/src/task/ability_start_task.cpp +++ b/services/abilitymgr_lite/src/task/ability_start_task.cpp @@ -39,8 +39,8 @@ void AbilityStartTask::SetWaitConnect(bool waitConnect) AbilityMsStatus AbilityStartTask::Execute() { PRINTD("AbilityStartTask", "start"); - if (abilityMgrContext_ == nullptr || want_ == nullptr || - target_ == nullptr || bundleInfo_ == nullptr) { + if (!abilityMgrContext_ || !want_ || + !target_ || !bundleInfo_) { return AbilityMsStatus::TaskStatus("start", "invalid argument"); } if (target_->abilityType == AbilityType::SERVICE) { @@ -53,7 +53,7 @@ AbilityMsStatus AbilityStartTask::Execute() // Step2: Generate target ability record. PageAbilityRecord *targetAbility = stackManager.GeneratePageAbility( *target_, *want_, topAbility, *abilityMgrContext_); - if (targetAbility == nullptr || targetAbility == topAbility) { + if (!targetAbility || targetAbility == topAbility) { return AbilityMsStatus::TaskStatus("start", "generate ability record failure"); } targetAbility->SetBundleInfo(*bundleInfo_); @@ -83,7 +83,7 @@ AbilityMsStatus AbilityStartTask::StartService() { PRINTD("AbilityStartTask", "start service"); auto connectMission = const_cast(abilityMgrContext_->GetServiceConnects()); - if (connectMission == nullptr) { + if (!connectMission) { return AbilityMsStatus::TaskStatus("start", "invalid argument"); } auto service = connectMission->FindServiceRecord(target_->bundleName, target_->name); diff --git a/services/abilitymgr_lite/src/task/ability_stop_task.cpp b/services/abilitymgr_lite/src/task/ability_stop_task.cpp index e3a17d4e99019d59bbbe42f8ead5fc79c1cb46e3..8af480da3bebf048cb922cc431b4b6c4e3dd50d3 100644 --- a/services/abilitymgr_lite/src/task/ability_stop_task.cpp +++ b/services/abilitymgr_lite/src/task/ability_stop_task.cpp @@ -24,17 +24,17 @@ AbilityStopTask::AbilityStopTask(AbilityMgrContext *context, uint64_t token) AbilityMsStatus AbilityStopTask::Execute() { PRINTD("AbilityStopTask", "start"); - if (abilityMgrContext_ == nullptr) { + if (!abilityMgrContext_) { return AbilityMsStatus::TaskStatus("stop", "invalid argument"); } AbilityStackManager &stackManager = AbilityStackManager::GetInstance(); // Step 1: Find stop ability record. PageAbilityRecord *stopAbility = stackManager.FindPageAbility(*abilityMgrContext_, token_); - if (stopAbility == nullptr) { + if (!stopAbility) { return AbilityMsStatus::TaskStatus("stop", "ability record not found"); } auto serviceConnects = const_cast(abilityMgrContext_->GetServiceConnects()); - if (serviceConnects == nullptr) { + if (!serviceConnects) { return AbilityMsStatus::TaskStatus("stop", "invalid argument"); } stopAbility->SetCurrentState(STATE_INITIAL); diff --git a/services/abilitymgr_lite/src/task/ability_terminate_service_task.cpp b/services/abilitymgr_lite/src/task/ability_terminate_service_task.cpp index f47256666507f1b2262cadbbed4b219baf53b8f2..bdcc09730f97a689d42b2f2de4b94e9f47d144ee 100644 --- a/services/abilitymgr_lite/src/task/ability_terminate_service_task.cpp +++ b/services/abilitymgr_lite/src/task/ability_terminate_service_task.cpp @@ -31,15 +31,15 @@ AbilityTerminateServiceTask::~AbilityTerminateServiceTask() AbilityMsStatus AbilityTerminateServiceTask::Execute() { PRINTD("AbilityTerminateServiceTask", "start"); - if (abilityMgrContext_ == nullptr || target_ == nullptr) { + if (!abilityMgrContext_ || !target_) { return AbilityMsStatus::TaskStatus("terminateService", "invalid argument"); } auto serviceConnects = abilityMgrContext_->GetServiceConnects(); - if (serviceConnects == nullptr) { + if (!serviceConnects) { return AbilityMsStatus::TaskStatus("terminateService", "invalid argument"); } auto service = serviceConnects->FindServiceRecord(target_->bundleName, target_->name); - if (service == nullptr) { + if (!service) { return AbilityMsStatus::TaskStatus("terminateService", "service does not exists"); } if (service->GetCurrentState() == STATE_UNINITIALIZED) { diff --git a/services/abilitymgr_lite/src/task/ability_terminate_task.cpp b/services/abilitymgr_lite/src/task/ability_terminate_task.cpp index 2ea2429a5d007927904d3b0212ff620d969c4702..bbf4feb4cd7e4f2a500e058d07a6c8b12b312b3e 100644 --- a/services/abilitymgr_lite/src/task/ability_terminate_task.cpp +++ b/services/abilitymgr_lite/src/task/ability_terminate_task.cpp @@ -26,13 +26,13 @@ AbilityTerminateTask::AbilityTerminateTask(AbilityMgrContext *context, uint64_t AbilityMsStatus AbilityTerminateTask::Execute() { PRINTD("AbilityTerminateTask", "start"); - if (abilityMgrContext_ == nullptr) { + if (!abilityMgrContext_) { return AbilityMsStatus::TaskStatus("ability terminate", "invalid argument"); } // Step1: Get ability record from stack AbilityStackManager &stackManager = AbilityStackManager::GetInstance(); PageAbilityRecord *terminateAbility = stackManager.FindPageAbility(*abilityMgrContext_, token_); - if (terminateAbility == nullptr) { + if (!terminateAbility) { return AbilityMsStatus::TaskStatus("ability terminate", "ability record not find"); } if (terminateAbility->GetAbilityInfo().abilityType == AbilityType::SERVICE) { diff --git a/services/abilitymgr_lite/src/task/app_restart_task.cpp b/services/abilitymgr_lite/src/task/app_restart_task.cpp index d59803bc0c4d5534cb400ccf294ed6f4042457a9..66c3999943ef40b7d350ffeb58442d4c3ea0a9dd 100644 --- a/services/abilitymgr_lite/src/task/app_restart_task.cpp +++ b/services/abilitymgr_lite/src/task/app_restart_task.cpp @@ -28,7 +28,7 @@ AppRestartTask::AppRestartTask(AbilityMgrContext *context, const BundleInfo *bun AbilityMsStatus AppRestartTask::Execute() { PRINTD("AppRestartTask", "start"); - if (abilityMgrContext_ == nullptr || bundleInfo_ == nullptr || bundleInfo_->bundleName == nullptr) { + if (!abilityMgrContext_ || !bundleInfo_ || !(bundleInfo_->bundleName)) { return AbilityMsStatus::TaskStatus("app terminate", "invalid argument"); } @@ -41,7 +41,7 @@ AbilityMsStatus AppRestartTask::Execute() // Step3: Get top page ability auto topRecord = const_cast(stackManager.GetTopPageAbility(*abilityMgrContext_)); - if (topRecord == nullptr) { + if (!topRecord) { return AbilityMsStatus::NoActiveAbilityStatus("restart app", "start launcher"); } else { // Step4: Active top ability diff --git a/services/abilitymgr_lite/src/task/app_terminate_task.cpp b/services/abilitymgr_lite/src/task/app_terminate_task.cpp index 505b793cbdc0f86cc5bd3ee46c7d7e89e05da055..bac9397407ad395bf0191cc3ad79500b2363307f 100644 --- a/services/abilitymgr_lite/src/task/app_terminate_task.cpp +++ b/services/abilitymgr_lite/src/task/app_terminate_task.cpp @@ -27,7 +27,7 @@ AppTerminateTask::AppTerminateTask(AbilityMgrContext *context, const char *bundl AbilityMsStatus AppTerminateTask::Execute() { PRINTD("AppTerminateTask", "start"); - if (abilityMgrContext_ == nullptr || bundleName_ == nullptr) { + if (!abilityMgrContext_ || !bundleName_) { return AbilityMsStatus::TaskStatus("app terminate", "invalid argument"); } diff --git a/services/abilitymgr_lite/src/util/abilityms_helper.cpp b/services/abilitymgr_lite/src/util/abilityms_helper.cpp index 71eb3835dbc42d54b1710cccdba4ea556002a1ff..c689aaba79d0af0fd799d7eb5ef64be5db6f3e6e 100755 --- a/services/abilitymgr_lite/src/util/abilityms_helper.cpp +++ b/services/abilitymgr_lite/src/util/abilityms_helper.cpp @@ -31,7 +31,7 @@ const int MAX_BUNDLE_NAME_SIZE = 128; bool AbilityMsHelper::IsLauncherAbility(const char *bundleName) { - if (bundleName == nullptr) { + if (!bundleName) { PRINTW("AbilityMsHelper", "bundleName is null"); return false; } @@ -40,7 +40,7 @@ bool AbilityMsHelper::IsLauncherAbility(const char *bundleName) bool AbilityMsHelper::IsAceAbility(const char *abilityName) { - if (abilityName == nullptr) { + if (!abilityName) { PRINTW("AbilityMsHelper", "abilityName is null"); return false; } @@ -64,10 +64,10 @@ AbilityMsStatus AbilityMsHelper::SetKeepAliveWant(const BundleInfo &bundleInfo, return AbilityMsStatus::HelpStatus("no ability exist"); } ElementName elementName = {}; - if (bundleInfo.abilityInfos[0].name == nullptr) { + if (!bundleInfo.abilityInfos[0].name) { return AbilityMsStatus::HelpStatus("abilityName is null"); } - if (bundleInfo.bundleName == nullptr) { + if (!bundleInfo.bundleName) { return AbilityMsStatus::HelpStatus("bundleName is null"); } SetElementAbilityName(&elementName, bundleInfo.abilityInfos[0].name); @@ -107,7 +107,7 @@ std::string AbilityMsHelper::AbilityStateToString(State state) bool AbilityMsHelper::IsLegalBundleName(const char *bundleName) { - if (bundleName == nullptr) { + if (!bundleName) { return false; } int len = strlen(bundleName); @@ -126,12 +126,12 @@ bool AbilityMsHelper::CheckVisiblePermission(pid_t callingUid, pid_t targetUid, return true; } IUnknown *iUnknown = SAMGR_GetInstance()->GetFeatureApi(BMS_SERVICE, BMS_FEATURE); - if (iUnknown == nullptr) { + if (!iUnknown) { return false; } BmsServerProxy *bmsServerProxy = nullptr; int result = iUnknown->QueryInterface(iUnknown, DEFAULT_VERSION, (void **) &bmsServerProxy); - if (result != 0 || bmsServerProxy == nullptr) { + if (result != 0 || !bmsServerProxy) { return false; } char *bundleName = nullptr; diff --git a/services/abilitymgr_lite/tools/src/ability_tool.cpp b/services/abilitymgr_lite/tools/src/ability_tool.cpp index 310d1694808494b48f4c8a6e31ad4d9b8417d0eb..116cb06807c5bd83fd6d2f52235acd26a13809e4 100755 --- a/services/abilitymgr_lite/tools/src/ability_tool.cpp +++ b/services/abilitymgr_lite/tools/src/ability_tool.cpp @@ -50,7 +50,7 @@ AbilityTool::~AbilityTool() bool AbilityTool::SetBundleName(const char *bundleName) { - if (bundleName == nullptr || strlen(bundleName) == 0) { + if (!bundleName || strlen(bundleName) == 0) { return false; } SetElementBundleName(&elementName_, bundleName); @@ -59,7 +59,7 @@ bool AbilityTool::SetBundleName(const char *bundleName) bool AbilityTool::SetAbilityName(const char *abilityName) { - if (abilityName == nullptr || strlen(abilityName) == 0) { + if (!abilityName || strlen(abilityName) == 0) { return false; } SetElementAbilityName(&elementName_, abilityName); @@ -73,7 +73,7 @@ void AbilityTool::SetExtra(const char *extra) bool AbilityTool::SetCommand(const char *command) { - if (command == nullptr) { + if (!command) { return false; } if (strcmp(command, CMD_START_ABILITY) != 0 && @@ -94,18 +94,18 @@ void AbilityTool::SetDumpAll() bool AbilityTool::RunCommand() { - if (command_ == nullptr) { + if (!command_) { printf("unknown command\n"); return false; } IUnknown *iUnknown = SAMGR_GetInstance()->GetFeatureApi(AMS_SERVICE, AMS_INNER_FEATURE); - if (iUnknown == nullptr) { + if (!iUnknown) { printf("ams inner unknown is null\n"); return false; } IClientProxy *innerProxy = nullptr; (void)iUnknown->QueryInterface(iUnknown, CLIENT_PROXY_VER, (void **)&innerProxy); - if (innerProxy == nullptr) { + if (!innerProxy) { printf("ams inner feature is null\n"); return false; } @@ -137,8 +137,8 @@ Want* AbilityTool::BuildWant() return nullptr; } if (!dumpAll_) { - if (elementName_.abilityName == nullptr || strlen(elementName_.abilityName) == 0 || - elementName_.bundleName == nullptr || strlen(elementName_.bundleName) == 0) { + if (!(elementName_.abilityName) || strlen(elementName_.abilityName) == 0 || + !(elementName_.bundleName) || strlen(elementName_.bundleName) == 0) { printf("ability name or bundle name is not entered\n"); delete want; return nullptr; @@ -157,7 +157,7 @@ Want* AbilityTool::BuildWant() bool AbilityTool::InnerStartAbility() { Want *want = BuildWant(); - if (want == nullptr) { + if (!want) { return false; } int ret = StartAbility(want); @@ -169,7 +169,7 @@ bool AbilityTool::InnerStartAbility() bool AbilityTool::InnerStopAbility() { Want *want = BuildWant(); - if (want == nullptr) { + if (!want) { return false; } int ret = StopAbility(want); @@ -180,10 +180,10 @@ bool AbilityTool::InnerStopAbility() bool AbilityTool::TerminateApp(IClientProxy *proxy) const { - if (proxy == nullptr) { + if (!proxy) { return false; } - if (elementName_.bundleName == nullptr || strlen(elementName_.bundleName) == 0) { + if (!elementName_.bundleName || strlen(elementName_.bundleName) == 0) { printf("invalid argument\n"); return false; } @@ -196,11 +196,11 @@ bool AbilityTool::TerminateApp(IClientProxy *proxy) const bool AbilityTool::Dump(IClientProxy *proxy) { - if (proxy == nullptr) { + if (!proxy) { return false; } Want *want = BuildWant(); - if (want == nullptr) { + if (!want) { return false; } @@ -235,12 +235,12 @@ bool AbilityTool::Dump(IClientProxy *proxy) int32_t AbilityTool::AaCallback(const IpcContext* context, void *ipcMsg, IpcIo *data, void *arg) { printf("get ability info\n"); - if (ipcMsg == nullptr) { + if (!ipcMsg) { printf("ams call back error, ipcMsg is null\n"); return -1; } auto abilityTool = static_cast(arg); - if (abilityTool == nullptr) { + if (!abilityTool) { printf("ams call back error, abilityTool is null\n"); FreeBuffer(nullptr, ipcMsg); return -1; @@ -265,7 +265,7 @@ int32_t AbilityTool::AaCallback(const IpcContext* context, void *ipcMsg, IpcIo * char *result = reinterpret_cast(IpcIoPopString(data, &len)); #else BuffPtr *buff = IpcIoPopDataBuff(data); - if ((buff == nullptr) || (buff->buff == nullptr)) { + if (!buff || !(buff->buff)) { printf("ams call back error, buff is empty\n"); if (flag == LITEIPC_FLAG_ONEWAY) { FreeBuffer(nullptr, ipcMsg); diff --git a/services/abilitymgr_lite/unittest/utils/ability_test_helper.cpp b/services/abilitymgr_lite/unittest/utils/ability_test_helper.cpp index 77090bc3f35e4e83c0371a3f6c203248d8a305d8..3d2df16ec1694eb754bc0352344bd88dd2878ca4 100644 --- a/services/abilitymgr_lite/unittest/utils/ability_test_helper.cpp +++ b/services/abilitymgr_lite/unittest/utils/ability_test_helper.cpp @@ -48,7 +48,7 @@ namespace OHOS { exit(-1); } proxy_ = GetAbilityInnerFeature(); - if (proxy_ == nullptr) { + if (!proxy_) { exit(-1); } sleep(1); @@ -84,7 +84,7 @@ namespace OHOS { int32_t AbilityTestHelper::AbilityCallback(const IpcContext* context, void *ipcMsg, IpcIo *data, void *arg) { - if (ipcMsg == nullptr) { + if (!ipcMsg) { printf("ams call back error, ipcMsg is null\n"); return -1; } @@ -109,7 +109,7 @@ namespace OHOS { } case SCHEDULER_DUMP_ABILITY: { BuffPtr *buff = IpcIoPopDataBuff(data); - if ((buff == nullptr) || (buff->buff == nullptr)) + if (!buff || !(buff->buff)) { printf("ams call back error, buff is empty\n"); return false; @@ -212,13 +212,13 @@ namespace OHOS { IClientProxy *AbilityTestHelper::GetAbilityInnerFeature() { IUnknown *iUnknown = SAMGR_GetInstance()->GetFeatureApi(AMS_SERVICE, AMS_INNER_FEATURE); - if (iUnknown == nullptr) { + if (!iUnknown) { printf("ams inner unknown is null\n"); return nullptr; } IClientProxy *innerProxy = nullptr; (void)iUnknown->QueryInterface(iUnknown, CLIENT_PROXY_VER, (void **)&innerProxy); - if (innerProxy == nullptr) { + if (!innerProxy) { printf("ams inner feature is null\n"); return nullptr; }