openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://github.com/openharmony/ability_ability_runtime.git synced 2026-08-24 12:43:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

!3590 cppcheck修改

Browse Source 
Merge pull request !3590 from mingxihua/master
This commit is contained in:
openharmony_ci
2022-10-27 01:49:27 +00:00
committed by Gitee
parent c697066d62 646d707516
commit b72d3bfd2a
11 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/js/napi/ability_manager/js_ability_manager.cpp
+1 -1
View File
@@ -208,7 +208,7 @@ private:
return result;
}
NativeValue* OnGetTopAbility(NativeEngine &engine, NativeCallbackInfo &info)
NativeValue* OnGetTopAbility(NativeEngine &engine, const NativeCallbackInfo &info)
{
HILOG_INFO("%{public}s is called", __FUNCTION__);
AsyncTask::CompleteCallback complete =
frameworks/js/napi/app/app_manager/js_app_manager.cpp
+1 -1
View File
@@ -222,7 +222,7 @@ private:
return result;
}
NativeValue* OnGetForegroundApplications(NativeEngine& engine, NativeCallbackInfo& info)
NativeValue* OnGetForegroundApplications(NativeEngine& engine, const NativeCallbackInfo& info)
{
HILOG_INFO("%{public}s is called", __FUNCTION__);
int32_t errCode = 0;
frameworks/js/napi/app/js_app_manager/js_app_manager.cpp
+2 -2
View File
@@ -145,7 +145,6 @@ private:
return engine.CreateUndefined();
}
static int64_t serialNumber = 0;
std::vector<std::string> bundleNameList;
// unwarp observer
if (observer_ == nullptr) {
@@ -159,6 +158,7 @@ private:
if (ret == 0) {
HILOG_DEBUG("RegisterApplicationStateObserver success.");
std::lock_guard<std::mutex> lock(g_observerMutex);
static int64_t serialNumber = 0;
int64_t observerId = serialNumber;
observer_->AddJsObserverObject(observerId, info.argv[INDEX_ZERO]);
if (serialNumber < INT32_MAX) {
@@ -226,7 +226,7 @@ private:
return result;
}
NativeValue* OnGetForegroundApplications(NativeEngine& engine, NativeCallbackInfo& info)
NativeValue* OnGetForegroundApplications(NativeEngine& engine, const NativeCallbackInfo& info)
{
HILOG_INFO("%{public}s is called", __FUNCTION__);
AsyncTask::CompleteCallback complete =
frameworks/js/napi/featureAbility/js_data_ability_helper.cpp
+1 -1
View File
@@ -55,7 +55,7 @@ static void OnChangeJSThreadWorker(uv_work_t *work, int status)
HILOG_ERROR("OnChange, uv_queue_work input work is nullptr.");
return;
}
DAHelperOnOffCB *onCB = (DAHelperOnOffCB *)work->data;
DAHelperOnOffCB *onCB = static_cast<DAHelperOnOffCB *>(work->data);
if (onCB == nullptr) {
HILOG_ERROR("OnChange, uv_queue_work onCB is nullptr.");
delete work;
frameworks/js/napi/featureAbility/js_data_ability_helper.h
+2 -2
View File
@@ -249,11 +249,11 @@ napi_value UnRegisterWrap(napi_env env, napi_callback_info info, DAHelperOnOffCB
* @brief Off Async.
*
* @param env The environment that the Node-API call is invoked under.
* @param insertCB Process data asynchronously.
* @param offCB Process data asynchronously.
*
* @return Return JS data successfully, otherwise return nullptr.
*/
napi_value UnRegisterAsync(napi_env env, DAHelperOnOffCB *insertCB);
napi_value UnRegisterAsync(napi_env env, DAHelperOnOffCB *offCB);
/**
* @brief Off asynchronous processing function.
frameworks/js/napi/featureAbility/napi_data_ability_operation.cpp
+2 -2
View File
@@ -161,8 +161,8 @@ bool GetDataAbilityOperationBuilder(
return true;
}
napi_value UnwrapValuesBucket(
const std::shared_ptr<NativeRdb::ValuesBucket> &param, napi_env env, napi_value valueBucketParam)
napi_value UnwrapValuesBucket(const std::shared_ptr<NativeRdb::ValuesBucket> &param, napi_env env,
napi_value valueBucketParam)
{
HILOG_INFO("%{public}s called.", __func__);
napi_value result;
frameworks/js/napi/featureAbility/napi_data_ability_operation.h
+3 -2
View File
@@ -53,11 +53,12 @@ bool GetDataAbilityOperationBuilder(
*
* @param param Indicates the valuesBucket parameters saved the parse result.
* @param env The environment that the Node-API call is invoked under.
* @param args Indicates the arguments passed into the callback.
* @param valueBucketParam Indicates the arguments passed into the callback.
*
* @return The return value from NAPI C++ to JS for the module.
*/
napi_value UnwrapValuesBucket(const std::shared_ptr<NativeRdb::ValuesBucket> &param, napi_env env, napi_value args);
napi_value UnwrapValuesBucket(const std::shared_ptr<NativeRdb::ValuesBucket> &param, napi_env env,
napi_value valueBucketParam);
/**
* @brief Parse the DataAbilityPredicatesBackReferences parameters.
*
frameworks/js/napi/inner/napi_common/napi_common_ability.cpp
+1
View File
@@ -4846,6 +4846,7 @@ NativeValue* JsNapiCommon::JsConnectAbility(
if (ability_ == nullptr) {
errorVal = static_cast<int32_t>(NAPI_ERR_ACE_ABILITY);
HILOG_ERROR("JsConnectAbility, the ability is nullptr");
return engine.CreateUndefined();
}
bool result = false;
frameworks/native/ability/native/ability_runtime/js_ability_context.cpp
+3 -8
View File
@@ -286,11 +286,6 @@ NativeValue* JsAbilityContext::OnStartAbilityByCall(NativeEngine& engine, Native
InheritWindowMode(want);
std::shared_ptr<StartAbilityByCallParameters> calls = std::make_shared<StartAbilityByCallParameters>();
if (calls == nullptr) {
HILOG_ERROR("calls create error");
ThrowError(engine, AbilityErrorCode::ERROR_CODE_INNER);
return engine.CreateUndefined();
}
NativeValue* lastParam = ((info.argc == ARGC_TWO) ? info.argv[ARGC_ONE] : nullptr);
NativeValue* retsult = nullptr;
@@ -542,7 +537,7 @@ NativeValue* JsAbilityContext::OnStartExtensionAbility(NativeEngine& engine, Nat
return result;
}
NativeValue* JsAbilityContext::OnStartExtensionAbilityWithAccount(NativeEngine& engine, NativeCallbackInfo& info)
NativeValue* JsAbilityContext::OnStartExtensionAbilityWithAccount(NativeEngine& engine, const NativeCallbackInfo& info)
{
HILOG_INFO("OnStartExtensionAbilityWithAccount is called.");
if (info.argc < ARGC_TWO) {
@@ -583,7 +578,7 @@ NativeValue* JsAbilityContext::OnStartExtensionAbilityWithAccount(NativeEngine&
return result;
}
NativeValue* JsAbilityContext::OnStopExtensionAbility(NativeEngine& engine, NativeCallbackInfo& info)
NativeValue* JsAbilityContext::OnStopExtensionAbility(NativeEngine& engine, const NativeCallbackInfo& info)
{
HILOG_INFO("OnStopExtensionAbility is called.");
if (info.argc < ARGC_ONE) {
@@ -621,7 +616,7 @@ NativeValue* JsAbilityContext::OnStopExtensionAbility(NativeEngine& engine, Nati
return result;
}
NativeValue* JsAbilityContext::OnStopExtensionAbilityWithAccount(NativeEngine& engine, NativeCallbackInfo& info)
NativeValue* JsAbilityContext::OnStopExtensionAbilityWithAccount(NativeEngine& engine, const NativeCallbackInfo& info)
{
HILOG_INFO("OnStartExtensionAbilityWithAccount is called.");
if (info.argc < ARGC_TWO) {
frameworks/native/ability/native/js_service_extension_context.cpp
-6
View File
@@ -216,12 +216,6 @@ private:
}
std::shared_ptr<StartAbilityByCallParameters> calls = std::make_shared<StartAbilityByCallParameters>();
if (calls == nullptr) {
HILOG_ERROR("calls create error");
ThrowError(engine, AbilityErrorCode::ERROR_CODE_INNER);
return engine.CreateUndefined();
}
NativeValue* retsult = nullptr;
calls->callerCallBack = std::make_shared<CallerCallBack>();
calls->callerCallBack->SetCallBack(GetCallBackDone(calls));
interfaces/kits/native/ability/native/ability_runtime/js_ability_context.h
+3 -3
View File
@@ -81,9 +81,9 @@ private:
NativeValue* OnStartAbilityForResult(NativeEngine& engine, NativeCallbackInfo& info);
NativeValue* OnStartAbilityForResultWithAccount(NativeEngine& engine, NativeCallbackInfo& info);
NativeValue* OnStartExtensionAbility(NativeEngine& engine, NativeCallbackInfo& info);
NativeValue* OnStartExtensionAbilityWithAccount(NativeEngine& engine, NativeCallbackInfo& info);
NativeValue* OnStopExtensionAbility(NativeEngine& engine, NativeCallbackInfo& info);
NativeValue* OnStopExtensionAbilityWithAccount(NativeEngine& engine, NativeCallbackInfo& info);
NativeValue* OnStartExtensionAbilityWithAccount(NativeEngine& engine, const NativeCallbackInfo& info);
NativeValue* OnStopExtensionAbility(NativeEngine& engine, const NativeCallbackInfo& info);
NativeValue* OnStopExtensionAbilityWithAccount(NativeEngine& engine, const NativeCallbackInfo& info);
NativeValue* OnTerminateSelfWithResult(NativeEngine& engine, NativeCallbackInfo& info);
NativeValue* OnConnectAbility(NativeEngine& engine, NativeCallbackInfo& info);
NativeValue* OnConnectAbilityWithAccount(NativeEngine& engine, NativeCallbackInfo& info);