From d06ba2f0042d21beed3e8f5a67e42790f894374e Mon Sep 17 00:00:00 2001 From: liulinsong Date: Sat, 24 May 2025 10:31:26 +0800 Subject: [PATCH] Compare variables of pointer type with nullptr Signed-off-by: liulinsong --- .../webview_javascript_result_callback.cpp | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/interfaces/kits/napi/webviewcontroller/webview_javascript_result_callback.cpp b/interfaces/kits/napi/webviewcontroller/webview_javascript_result_callback.cpp index 826228c49..5dce36c5b 100644 --- a/interfaces/kits/napi/webviewcontroller/webview_javascript_result_callback.cpp +++ b/interfaces/kits/napi/webviewcontroller/webview_javascript_result_callback.cpp @@ -901,7 +901,7 @@ void ExecuteGetJavaScriptResult( auto* inParam = static_cast(param->input); auto* outParam = static_cast(param->out); std::shared_ptr jsObj = inParam->webJsResCb->FindObject(inParam->objId); - if (!jsObj) { + if (jsObj == nullptr) { std::unique_lock lock(param->mutex); param->ready = true; param->condition.notify_all(); @@ -948,7 +948,7 @@ std::shared_ptr WebviewJavaScriptResultCallBack::GetJavaScriptResultS { std::shared_ptr ret = std::make_shared(NWebValue::Type::NONE); std::shared_ptr jsObj = FindObject(objectId); - if (!jsObj) { + if (jsObj == nullptr) { return ret; } Ace::ContainerScope containerScope(jsObj->GetContainerScopeId()); @@ -978,7 +978,7 @@ std::shared_ptr WebviewJavaScriptResultCallBack::GetJavaScriptResultS JavaScriptOb::ObjectID returnedObjectId; if (FindObjectIdInJsTd(jsObj->GetEnv(), callResult, &returnedObjectId)) { std::shared_ptr obj = FindObject(returnedObjectId); - if (obj) { + if (obj != nullptr) { obj->AddHolder(routingId); } } else { @@ -1008,7 +1008,7 @@ std::shared_ptr WebviewJavaScriptResultCallBack::GetJavaScriptResult( objName.c_str(), method.c_str(), routingId, objectId); std::shared_ptr ret = std::make_shared(NWebValue::Type::NONE); std::shared_ptr jsObj = FindObject(objectId); - if (!jsObj || !jsObj->HasMethod(method)) { + if (jsObj == nullptr || !jsObj->HasMethod(method)) { return ret; } @@ -1122,7 +1122,7 @@ std::shared_ptr WebviewJavaScriptResultCallBack::GetJavaScriptResultS std::vector argv) { std::shared_ptr ret = std::make_shared(NWebValue::Type::NONE); - if (!jsObj) { + if (jsObj == nullptr) { WVLOG_E("WebviewJavaScriptResultCallBack::ExecuteGetJavaScriptResult jsObj null"); return ret; } @@ -1165,7 +1165,7 @@ std::shared_ptr WebviewJavaScriptResultCallBack::GetJavaScriptResultS { std::shared_ptr ret = std::make_shared(NWebValue::Type::NONE); std::shared_ptr jsObj = FindObject(objectId); - if (!jsObj) { + if (jsObj == nullptr) { return ret; } NApiScope scope(jsObj->GetEnv()); @@ -1199,7 +1199,7 @@ std::shared_ptr WebviewJavaScriptResultCallBack::GetJavaScriptResultF WVLOG_D("GetJavaScriptResult method = %{public}s", method.c_str()); std::shared_ptr ret = std::make_shared(NWebValue::Type::NONE); std::shared_ptr jsObj = FindObject(objectId); - if (!jsObj || !jsObj->HasMethod(method)) { + if (jsObj == nullptr || !jsObj->HasMethod(method)) { return ret; } @@ -1252,7 +1252,7 @@ std::shared_ptr WebviewJavaScriptResultCallBack::PostGetJavaScriptRes method.c_str()); std::shared_ptr ret = std::make_shared(NWebValue::Type::NONE); std::shared_ptr jsObj = FindObject(objectId); - if (!jsObj) { + if (jsObj == nullptr) { return ret; } napi_env env = jsObj->GetEnv(); @@ -1312,7 +1312,7 @@ void ExecuteHasJavaScriptObjectMethods( auto* inParam = static_cast(param->input); auto* outParam = static_cast(param->out); std::shared_ptr jsObj = inParam->webJsResCb->FindObject(inParam->objId); - if (!jsObj) { + if (jsObj == nullptr) { std::unique_lock lock(param->mutex); param->ready = true; param->condition.notify_all(); @@ -1340,7 +1340,7 @@ bool WebviewJavaScriptResultCallBack::PostHasJavaScriptObjectMethodsToJsThread( { bool ret = false; std::shared_ptr jsObj = FindObject(objectId); - if (!jsObj) { + if (jsObj == nullptr) { return false; } napi_env env = jsObj->GetEnv(); @@ -1373,7 +1373,7 @@ bool WebviewJavaScriptResultCallBack::HasJavaScriptObjectMethods(int32_t objectI { bool ret = false; std::shared_ptr jsObj = FindObject(objectId); - if (!jsObj) { + if (jsObj == nullptr) { return false; } napi_env env = jsObj->GetEnv(); @@ -1420,7 +1420,7 @@ void ExecuteGetJavaScriptObjectMethods( auto* outParam = static_cast(param->out); std::shared_ptr jsObj = inParam->webJsResCb->FindObject(inParam->objId); - if (!jsObj) { + if (jsObj == nullptr) { std::unique_lock lock(param->mutex); param->ready = true; param->condition.notify_all(); @@ -1448,7 +1448,7 @@ std::shared_ptr WebviewJavaScriptResultCallBack::PostGetJavaScriptObj { auto ret = std::make_shared(NWebValue::Type::LIST); std::shared_ptr jsObj = FindObject(objectId); - if (!jsObj) { + if (jsObj == nullptr) { return ret; } napi_env env = jsObj->GetEnv(); @@ -1480,7 +1480,7 @@ std::shared_ptr WebviewJavaScriptResultCallBack::GetJavaScriptObjectM { auto ret = std::make_shared(NWebValue::Type::LIST); std::shared_ptr jsObj = FindObject(objectId); - if (!jsObj) { + if (jsObj == nullptr) { return ret; } napi_env env = jsObj->GetEnv(); @@ -1520,7 +1520,7 @@ void WebviewJavaScriptResultCallBack::RemoveJavaScriptObjectHolderInJsTd( int32_t holder, JavaScriptOb::ObjectID objectId) { std::shared_ptr jsObj = FindObject(objectId); - if (jsObj && !(jsObj->IsNamed())) { + if (jsObj != nullptr && !(jsObj->IsNamed())) { jsObj->RemoveHolder(holder); if (!(jsObj->HasHolders())) { // reminder me: object->ToWeakRef(), object is erased so the destructor @@ -1541,7 +1541,7 @@ void ExecuteRemoveJavaScriptObjectHolder( auto* inParam = static_cast(param->input); std::shared_ptr jsObj = inParam->webJsResCb->FindObject(inParam->objId); - if (!jsObj) { + if (jsObj == nullptr) { std::unique_lock lock(param->mutex); param->ready = true; param->condition.notify_all(); @@ -1567,7 +1567,7 @@ void WebviewJavaScriptResultCallBack::PostRemoveJavaScriptObjectHolderToJsThread "objectId = %{public}d", objectId); std::shared_ptr jsObj = FindObject(objectId); - if (!jsObj) { + if (jsObj == nullptr) { return; } napi_env env = jsObj->GetEnv(); @@ -1600,7 +1600,7 @@ void WebviewJavaScriptResultCallBack::RemoveJavaScriptObjectHolder(int32_t holde "objectId = %{public}d", objectId); std::shared_ptr jsObj = FindObject(objectId); - if (!jsObj) { + if (jsObj == nullptr) { return; } napi_env env = jsObj->GetEnv(); -- Gitee