diff --git a/interfaces/kits/js/bundle_monitor/bundle_monitor.cpp b/interfaces/kits/js/bundle_monitor/bundle_monitor.cpp index a1dcf4dcb5861b9e39d539d7f415c14234de7bd3..d364ddf529e6ae3d68e2ae117bfd919b9dbf3127 100755 --- a/interfaces/kits/js/bundle_monitor/bundle_monitor.cpp +++ b/interfaces/kits/js/bundle_monitor/bundle_monitor.cpp @@ -68,13 +68,13 @@ napi_value Register(napi_env env, napi_callback_info info) return nullptr; } if (!iBundleMgr->VerifySystemApi(Constants::INVALID_API_VERSION)) { - APP_LOGE("register bundle status callback failed due to non-sys app calling"); + APP_LOGE("register bundle failed due to non-sys app calling"); auto error = BusinessError::CreateCommonError(env, ERROR_NOT_SYSTEM_APP); napi_throw(env, error); return nullptr; } if (!iBundleMgr->VerifyCallingPermission(Constants::LISTEN_BUNDLE_CHANGE)) { - APP_LOGE("register bundle status callback failed due to lack of permission"); + APP_LOGE("register bundle failed due to lack of permission"); BusinessError::ThrowError(env, ERROR_PERMISSION_DENIED_ERROR, PERMISSION_ON_DENIED); return nullptr; } @@ -107,13 +107,13 @@ napi_value Unregister(napi_env env, napi_callback_info info) return nullptr; } if (!iBundleMgr->VerifySystemApi(Constants::INVALID_API_VERSION)) { - APP_LOGE("unregister bundle status callback failed due to non-sys app calling"); + APP_LOGE("unregister bundle failed due to non-sys app calling"); auto error = BusinessError::CreateCommonError(env, ERROR_NOT_SYSTEM_APP); napi_throw(env, error); return nullptr; } if (!iBundleMgr->VerifyCallingPermission(Constants::LISTEN_BUNDLE_CHANGE)) { - APP_LOGE("unregister bundle status callback failed due to lack of permission"); + APP_LOGE("unregister bundle failed due to lack of permission"); BusinessError::ThrowError(env, ERROR_PERMISSION_DENIED_ERROR, PERMISSION_OFF_DENIED); return nullptr; } diff --git a/interfaces/kits/js/bundle_monitor/bundle_monitor_callback.cpp b/interfaces/kits/js/bundle_monitor/bundle_monitor_callback.cpp index 9eeef56064da3aced64cdf8254480001feb04df5..930ad503c90bca7ea5efd8800c975b1639196f34 100755 --- a/interfaces/kits/js/bundle_monitor/bundle_monitor_callback.cpp +++ b/interfaces/kits/js/bundle_monitor/bundle_monitor_callback.cpp @@ -178,7 +178,7 @@ void BundleMonitorCallback::OnReceiveEvent(const EventFwk::CommonEventData &even } else if (action == EventFwk::CommonEventSupport::COMMON_EVENT_PACKAGE_REMOVED) { BundleMonitorEmit(REMOVE, bundleName, userId, appIndex); } else { - APP_LOGI("OnReceiveEvent action = %{public}s not support", action.c_str()); + APP_LOGI("%{public}s not support", action.c_str()); } } } diff --git a/interfaces/kits/js/bundle_resource/bundle_resource.cpp b/interfaces/kits/js/bundle_resource/bundle_resource.cpp index 70e8e6967f15d7c582435f4fd94309d25c08177c..9c326c94c9f7cc36070fd069dc5d2cc42c3728fb 100644 --- a/interfaces/kits/js/bundle_resource/bundle_resource.cpp +++ b/interfaces/kits/js/bundle_resource/bundle_resource.cpp @@ -187,7 +187,7 @@ static ErrCode InnerGetBundleResourceInfo( } ErrCode ret = bundleResourceProxy->GetBundleResourceInfo(bundleName, flags, resourceInfo, appIndex); if (ret != ERR_OK) { - APP_LOGE("failed, bundleName is %{public}s, errCode: %{public}d", bundleName.c_str(), ret); + APP_LOGE("failed, bundleName %{public}s, errCode: %{public}d", bundleName.c_str(), ret); } return CommonFunc::ConvertErrCode(ret); } @@ -203,7 +203,7 @@ napi_value GetBundleResourceInfo(napi_env env, napi_callback_info info) } std::string bundleName; if (!CommonFunc::ParseString(env, args[ARGS_POS_ZERO], bundleName) || bundleName.empty()) { - APP_LOGE("parse bundleName failed, bundleName is %{public}s", bundleName.c_str()); + APP_LOGE("parse bundleName failed, bundleName %{public}s", bundleName.c_str()); BusinessError::ThrowParameterTypeError(env, ERROR_PARAM_CHECK_ERROR, BUNDLE_NAME, TYPE_STRING); return nullptr; } @@ -255,7 +255,7 @@ static ErrCode InnerGetLauncherAbilityResourceInfo( ErrCode ret = bundleResourceProxy->GetLauncherAbilityResourceInfo(bundleName, flags, launcherAbilityResourceInfo, appIndex); if (ret != ERR_OK) { - APP_LOGE("failed, bundleName is %{public}s, errCode: %{public}d", bundleName.c_str(), ret); + APP_LOGE("failed, bundleName %{public}s, errCode: %{public}d", bundleName.c_str(), ret); } return CommonFunc::ConvertErrCode(ret); } @@ -271,7 +271,7 @@ napi_value GetLauncherAbilityResourceInfo(napi_env env, napi_callback_info info) } std::string bundleName; if (!CommonFunc::ParseString(env, args[ARGS_POS_ZERO], bundleName) || bundleName.empty()) { - APP_LOGE("parse bundleName failed, bundleName is %{public}s", bundleName.c_str()); + APP_LOGE("parse bundleName failed, bundleName %{public}s", bundleName.c_str()); BusinessError::ThrowParameterTypeError(env, ERROR_PARAM_CHECK_ERROR, BUNDLE_NAME, TYPE_STRING); return nullptr; } diff --git a/interfaces/kits/js/bundlemgr/bundle_mgr.cpp b/interfaces/kits/js/bundlemgr/bundle_mgr.cpp index 82a66458a93dc57d677a6ba32839348b9d662d91..6474909b470ddd2431fa646522db9bf764b6a832 100644 --- a/interfaces/kits/js/bundlemgr/bundle_mgr.cpp +++ b/interfaces/kits/js/bundlemgr/bundle_mgr.cpp @@ -273,7 +273,7 @@ static void ConvertApplicationInfo(napi_env env, napi_value objAppInfo, const Ap napi_value nName; NAPI_CALL_RETURN_VOID(env, napi_create_string_utf8(env, appInfo.name.c_str(), NAPI_AUTO_LENGTH, &nName)); NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objAppInfo, "name", nName)); - APP_LOGI("ConvertApplicationInfo name=%{public}s.", appInfo.name.c_str()); + APP_LOGI("name=%{public}s.", appInfo.name.c_str()); napi_value nCodePath; NAPI_CALL_RETURN_VOID( @@ -972,7 +972,7 @@ static void ConvertFormInfo(napi_env env, napi_value objformInfo, const FormInfo napi_value nName; NAPI_CALL_RETURN_VOID(env, napi_create_string_utf8(env, formInfo.name.c_str(), NAPI_AUTO_LENGTH, &nName)); NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objformInfo, "name", nName)); - APP_LOGI("ConvertFormInfo name=%{public}s.", formInfo.name.c_str()); + APP_LOGI("name=%{public}s.", formInfo.name.c_str()); napi_value nDescription; NAPI_CALL_RETURN_VOID( @@ -1059,13 +1059,13 @@ static void ConvertFormInfo(napi_env env, napi_value objformInfo, const FormInfo napi_value nSrc; NAPI_CALL_RETURN_VOID(env, napi_create_string_utf8(env, formInfo.src.c_str(), NAPI_AUTO_LENGTH, &nSrc)); NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objformInfo, "src", nSrc)); - APP_LOGI("ConvertFormInfo src=%{public}s.", formInfo.src.c_str()); + APP_LOGI("src=%{public}s.", formInfo.src.c_str()); napi_value nWindow; NAPI_CALL_RETURN_VOID(env, napi_create_object(env, &nWindow)); ConvertFormWindow(env, nWindow, formInfo.window); - APP_LOGI("ConvertFormInfo window.designWidth=%{public}d.", formInfo.window.designWidth); - APP_LOGI("ConvertFormInfo window.autoDesignWidth=%{public}d.", formInfo.window.autoDesignWidth); + APP_LOGI("window.designWidth=%{public}d.", formInfo.window.designWidth); + APP_LOGI("window.autoDesignWidth=%{public}d.", formInfo.window.autoDesignWidth); NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objformInfo, "window", nWindow)); } @@ -2083,7 +2083,7 @@ napi_value GetAllFormsInfo(napi_env env, napi_callback_info info) napi_value thisArg; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisArg, &data)); - APP_LOGI("ARGCSIZE is =%{public}zu.", argc); + APP_LOGI("ARGCSIZE=%{public}zu.", argc); AsyncFormInfosCallbackInfo *asyncCallbackInfo = new (std::nothrow) AsyncFormInfosCallbackInfo(env); if (asyncCallbackInfo == nullptr) { @@ -2188,7 +2188,7 @@ napi_value GetFormsInfoByModule(napi_env env, napi_callback_info info) napi_value thisArg; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisArg, &data)); - APP_LOGI("ARGCSIZE is =%{public}zu.", argc); + APP_LOGI("ARGCSIZE=%{public}zu.", argc); std::string bundleName; std::string moduleName; ParseString(env, bundleName, argv[PARAM0]); @@ -2302,7 +2302,7 @@ napi_value GetFormsInfoByApp(napi_env env, napi_callback_info info) napi_value thisArg; void *data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisArg, &data)); - APP_LOGI("ARGCSIZE is =%{public}zu.", argc); + APP_LOGI("ARGCSIZE=%{public}zu.", argc); std::string bundleName; ParseString(env, bundleName, argv[PARAM0]); @@ -2619,7 +2619,7 @@ static bool InnerSetApplicationEnabled(const std::string &bundleName, bool isEna } ErrCode result = iBundleMgr->SetApplicationEnabled(bundleName, isEnable); if (result != ERR_OK) { - APP_LOGE("InnerSetApplicationEnabled failed, bundleName is %{public}s, error is %{public}d", + APP_LOGE("set application enable failed, bundleName %{public}s, error %{public}d", bundleName.c_str(), result); return false; } @@ -2635,7 +2635,7 @@ static bool InnerSetAbilityEnabled(const OHOS::AppExecFwk::AbilityInfo &abilityI } ErrCode result = iBundleMgr->SetAbilityEnabled(abilityInfo, isEnable); if (result != ERR_OK) { - APP_LOGE("InnerSetAbilityEnabled failed, error is %{public}d", result); + APP_LOGE("set ability enabled failed, error %{public}d", result); return false; } return true; @@ -2656,7 +2656,7 @@ static bool InnerCleanBundleCacheCallback( int32_t userId = IPCSkeleton::GetCallingUid() / Constants::BASE_USER_RANGE; ErrCode result = iBundleMgr->CleanBundleCacheFiles(bundleName, cleanCacheCallback, userId); if (result != ERR_OK) { - APP_LOGE("CleanBundleDataFiles call error, bundleName is %{public}s, userId is %{public}d", + APP_LOGE("clean bundle cache error, bundleName %{public}s, userId %{public}d", bundleName.c_str(), userId); return false; } @@ -2727,7 +2727,7 @@ static bool InnerGetNameForUid(int32_t uid, std::string &bundleName) return false; } if (iBundleMgr->GetNameForUid(uid, bundleName) != ERR_OK) { - APP_LOGE("GetNameForUid failed, uid is %{public}d, bundleName is %{public}s", uid, bundleName.c_str()); + APP_LOGE("get bundlename failed, uid %{public}d, bundleName %{public}s", uid, bundleName.c_str()); return false; } return true; @@ -3337,7 +3337,7 @@ static bool InnerGetBundleInfo( } bool ret = iBundleMgr->GetBundleInfo(bundleName, flags, bundleInfo, bundleOptions.userId); if (!ret) { - APP_LOGE("bundleInfo is not find, bundleName is %{public}s, flags is %{public}d, userId is %{public}d", + APP_LOGE("bundleInfo not find, bundleName %{public}s, flags %{public}d, userId %{public}d", bundleName.c_str(), flags, bundleOptions.userId); } return ret; @@ -3589,7 +3589,7 @@ void GetAbilityIconExec(napi_env env, void *data) return; } if (asyncCallbackInfo->err != NO_ERROR) { - APP_LOGE("asyncCallbackInfo->err is not NO_ERROR, but %{public}d", asyncCallbackInfo->err); + APP_LOGE("asyncCallbackInfo->err error but %{public}d", asyncCallbackInfo->err); return; } BundleGraphicsClient client; @@ -3740,7 +3740,7 @@ void GetBundleArchiveInfoExec(napi_env env, void *data) return; } if (asyncCallbackInfo->err != NO_ERROR) { - APP_LOGE("asyncCallbackInfo->err is not NO_ERROR, but %{public}d", asyncCallbackInfo->err); + APP_LOGE("asyncCallbackInfo->err error, but %{public}d", asyncCallbackInfo->err); return; } auto iBundleMgr = CommonFunc::GetBundleMgr(); @@ -3765,11 +3765,11 @@ void GetBundleArchiveInfoComplete(napi_env env, napi_status status, void *data) std::unique_ptr callbackPtr {asyncCallbackInfo}; napi_value result[ARGS_SIZE_TWO] = {0}; if (asyncCallbackInfo->err != NO_ERROR) { - APP_LOGE("asyncCallbackInfo->err is %{public}d", asyncCallbackInfo->err); + APP_LOGE("asyncCallbackInfo->err %{public}d", asyncCallbackInfo->err); result[0] = BusinessError::CreateError(env, asyncCallbackInfo->err, "type mismatch"); NAPI_CALL_RETURN_VOID(env, napi_get_undefined(env, &result[1])); } else if (!asyncCallbackInfo->ret) { - APP_LOGE("asyncCallbackInfo->ret is %{public}d", asyncCallbackInfo->ret); + APP_LOGE("asyncCallbackInfo->ret %{public}d", asyncCallbackInfo->ret); asyncCallbackInfo->err = OPERATION_FAILED; result[0] = BusinessError::CreateError(env, OPERATION_FAILED, "GetBundleArchiveInfo falied"); NAPI_CALL_RETURN_VOID(env, napi_get_undefined(env, &result[1])); @@ -3836,7 +3836,7 @@ void GetLaunchWantForBundleExec(napi_env env, void *data) return; } if (asyncCallbackInfo->err != NO_ERROR) { - APP_LOGE("asyncCallbackInfo->err is not NO_ERROR, but %{public}d", asyncCallbackInfo->err); + APP_LOGE("asyncCallbackInfo->err error, but %{public}d", asyncCallbackInfo->err); return; } auto iBundleMgr = CommonFunc::GetBundleMgr(); @@ -3861,11 +3861,11 @@ void GetLaunchWantForBundleComplete(napi_env env, napi_status status, void *data std::unique_ptr callbackPtr {asyncCallbackInfo}; napi_value result[ARGS_SIZE_TWO] = {0}; if (asyncCallbackInfo->err != NO_ERROR) { - APP_LOGE("asyncCallbackInfo->err is %{public}d", asyncCallbackInfo->err); + APP_LOGE("asyncCallbackInfo->err %{public}d", asyncCallbackInfo->err); result[0] = BusinessError::CreateError(env, asyncCallbackInfo->err, TYPE_MISMATCH); NAPI_CALL_RETURN_VOID(env, napi_get_undefined(env, &result[1])); } else if (asyncCallbackInfo->ret != ERR_OK) { - APP_LOGE("asyncCallbackInfo->ret is %{public}d", asyncCallbackInfo->ret); + APP_LOGE("asyncCallbackInfo->ret %{public}d", asyncCallbackInfo->ret); asyncCallbackInfo->err = OPERATION_FAILED; result[0] = BusinessError::CreateError(env, OPERATION_FAILED, "GetLaunchWantForBundle falied"); NAPI_CALL_RETURN_VOID(env, napi_get_undefined(env, &result[1])); @@ -3926,7 +3926,7 @@ void IsAbilityEnabledExec(napi_env env, void *data) return; } if (asyncCallbackInfo->err != NO_ERROR) { - APP_LOGE("asyncCallbackInfo->err is not NO_ERROR, but %{public}d", asyncCallbackInfo->err); + APP_LOGE("asyncCallbackInfo->err error, but %{public}d", asyncCallbackInfo->err); return; } auto bundleMgr = CommonFunc::GetBundleMgr(); @@ -3949,7 +3949,7 @@ void IsAbilityEnabledComplete(napi_env env, napi_status status, void *data) std::unique_ptr callbackPtr {asyncCallbackInfo}; napi_value result[ARGS_SIZE_TWO] = {0}; if (asyncCallbackInfo->err != NO_ERROR) { - APP_LOGE("asyncCallbackInfo->err is %{public}d", asyncCallbackInfo->err); + APP_LOGE("asyncCallbackInfo->err %{public}d", asyncCallbackInfo->err); result[0] = BusinessError::CreateError(env, asyncCallbackInfo->err, TYPE_MISMATCH); NAPI_CALL_RETURN_VOID(env, napi_get_undefined(env, &result[1])); } else { @@ -4008,7 +4008,7 @@ void IsApplicationEnabledExec(napi_env env, void *data) return; } if (asyncCallbackInfo->err != NO_ERROR) { - APP_LOGE("asyncCallbackInfo->err is not NO_ERROR, but %{public}d", asyncCallbackInfo->err); + APP_LOGE("asyncCallbackInfo->err error, but %{public}d", asyncCallbackInfo->err); return; } auto bundleMgr = CommonFunc::GetBundleMgr(); @@ -4031,7 +4031,7 @@ void IsApplicationEnabledComplete(napi_env env, napi_status status, void *data) std::unique_ptr callbackPtr {asyncCallbackInfo}; napi_value result[ARGS_SIZE_TWO] = {0}; if (asyncCallbackInfo->err != NO_ERROR) { - APP_LOGE("asyncCallbackInfo->err is %{public}d", asyncCallbackInfo->err); + APP_LOGE("asyncCallbackInfo->err %{public}d", asyncCallbackInfo->err); result[0] = BusinessError::CreateError(env, asyncCallbackInfo->err, TYPE_MISMATCH); NAPI_CALL_RETURN_VOID(env, napi_get_undefined(env, &result[1])); } else { @@ -4431,7 +4431,7 @@ static std::string InnerGetAbilityLabel(napi_env env, std::string &bundleName, s std::string label; ErrCode ret = iBundleMgr->GetAbilityLabel(bundleName, moduleName, abilityName, label); if (ret != ERR_OK) { - APP_LOGE("can not GetAbilityLabel, bundleName is %{public}s.", bundleName.c_str()); + APP_LOGE("can not GetAbilityLabel, bundleName %{public}s.", bundleName.c_str()); return Constants::EMPTY_STRING; } return label; @@ -5358,7 +5358,7 @@ napi_value Recover(napi_env env, napi_callback_info info) ParseString(env, bundleName, argv[PARAM0]); InstallParam installParam; if (!ParseInstallParam(env, installParam, argv[PARAM1])) { - APP_LOGE("Recover installParam error, bundleName is %{public}s.", bundleName.c_str()); + APP_LOGE("installParam error, bundleName %{public}s.", bundleName.c_str()); asyncCallbackInfo->errCode = PARAM_TYPE_ERROR; } @@ -5531,7 +5531,7 @@ napi_value Uninstall(napi_env env, napi_callback_info info) ParseString(env, bundleName, argv[PARAM0]); InstallParam installParam; if (!ParseInstallParam(env, installParam, argv[PARAM1])) { - APP_LOGE("Uninstall installParam error, bundleName is %{public}s.", bundleName.c_str()); + APP_LOGE("installParam error, bundleName %{public}s.", bundleName.c_str()); asyncCallbackInfo->errCode = PARAM_TYPE_ERROR; } diff --git a/interfaces/kits/js/common/common_func.cpp b/interfaces/kits/js/common/common_func.cpp index 2a9075f9422b7a2eae008782424922cce4820cb6..5d86c7b3f8950b985fb03d0659d66ce8f616d653 100644 --- a/interfaces/kits/js/common/common_func.cpp +++ b/interfaces/kits/js/common/common_func.cpp @@ -223,7 +223,7 @@ bool CommonFunc::ParsePropertyArray(napi_env env, napi_value args, const std::st bool hasKey = false; napi_has_named_property(env, args, propertyName.c_str(), &hasKey); if (!hasKey) { - APP_LOGW("%{public}s is not existed", propertyName.c_str()); + APP_LOGW("%{public}s not exist", propertyName.c_str()); return true; } napi_value property = nullptr; @@ -260,7 +260,7 @@ bool CommonFunc::ParseStringPropertyFromObject(napi_env env, napi_value args, co napi_has_named_property(env, args, propertyName.c_str(), &hasKey); if (!hasKey) { if (isNecessary) { - APP_LOGE("%{public}s is not existed", propertyName.c_str()); + APP_LOGE("%{public}s not exist", propertyName.c_str()); return false; } return true; @@ -296,7 +296,7 @@ bool CommonFunc::ParsePropertyFromObject(napi_env env, napi_value args, const Pr napi_has_named_property(env, args, propertyInfo.propertyName.c_str(), &hasKey); if (!hasKey) { if (propertyInfo.isNecessary) { - APP_LOGE("%{public}s is not existed", propertyInfo.propertyName.c_str()); + APP_LOGE("%{public}s not exist", propertyInfo.propertyName.c_str()); return false; } return true; diff --git a/interfaces/kits/js/default_app/js_default_app.cpp b/interfaces/kits/js/default_app/js_default_app.cpp index eb434dee837ca0034d8158521ef6b30e53ded601..88ea67604c89a55bf53cb6b6a8b33944eacf9f94 100644 --- a/interfaces/kits/js/default_app/js_default_app.cpp +++ b/interfaces/kits/js/default_app/js_default_app.cpp @@ -259,7 +259,7 @@ void IsDefaultApplicationComplete(napi_env env, napi_status status, void *data) { DefaultAppCallbackInfo *asyncCallbackInfo = reinterpret_cast(data); if (asyncCallbackInfo == nullptr) { - APP_LOGE("asyncCallbackInfo is null in %{public}s", __func__); + APP_LOGE("asyncCallbackInfo is null %{public}s", __func__); return; } std::unique_ptr callbackPtr {asyncCallbackInfo}; @@ -406,7 +406,7 @@ void GetDefaultApplicationComplete(napi_env env, napi_status status, void *data) { DefaultAppCallbackInfo *asyncCallbackInfo = reinterpret_cast(data); if (asyncCallbackInfo == nullptr) { - APP_LOGE("asyncCallbackInfo is null in %{public}s", __func__); + APP_LOGE("asyncCallbackInfo is null %{public}s", __func__); return; } std::unique_ptr callbackPtr {asyncCallbackInfo}; @@ -525,7 +525,7 @@ napi_value GetDefaultApplicationSync(napi_env env, napi_callback_info info) ErrCode ret = defaultAppProxy->GetDefaultApplication(userId, type, bundleInfo); ret = CommonFunc::ConvertErrCode(ret); if (ret != ERR_OK) { - APP_LOGE("GetDefaultApplicationSync failed: %{public}d", ret); + APP_LOGE("failed: %{public}d", ret); napi_value businessError = BusinessError::CreateCommonError( env, ret, GET_DEFAULT_APPLICATION_SYNC, Constants::PERMISSION_GET_DEFAULT_APPLICATION); napi_throw(env, businessError); @@ -569,7 +569,7 @@ void SetDefaultApplicationComplete(napi_env env, napi_status status, void *data) { DefaultAppCallbackInfo *asyncCallbackInfo = reinterpret_cast(data); if (asyncCallbackInfo == nullptr) { - APP_LOGE("asyncCallbackInfo is null in %{public}s", __func__); + APP_LOGE("asyncCallbackInfo is null %{public}s", __func__); return; } std::unique_ptr callbackPtr {asyncCallbackInfo}; @@ -701,7 +701,7 @@ napi_value SetDefaultApplicationSync(napi_env env, napi_callback_info info) type, want); ret = CommonFunc::ConvertErrCode(ret); if (ret != ERR_OK) { - APP_LOGE("SetDefaultApplicationSync failed: %{public}d", ret); + APP_LOGE("failed: %{public}d", ret); napi_value businessError = BusinessError::CreateCommonError( env, ret, SET_DEFAULT_APPLICATION_SYNC, Constants::PERMISSION_SET_DEFAULT_APPLICATION); napi_throw(env, businessError); @@ -742,7 +742,7 @@ void ResetDefaultApplicationComplete(napi_env env, napi_status status, void *dat { DefaultAppCallbackInfo *asyncCallbackInfo = reinterpret_cast(data); if (asyncCallbackInfo == nullptr) { - APP_LOGE("asyncCallbackInfo is null in %{public}s", __func__); + APP_LOGE("asyncCallbackInfo is null %{public}s", __func__); return; } std::unique_ptr callbackPtr {asyncCallbackInfo}; @@ -860,7 +860,7 @@ napi_value ResetDefaultApplicationSync(napi_env env, napi_callback_info info) ErrCode ret = defaultAppProxy->ResetDefaultApplication(userId, type); ret = CommonFunc::ConvertErrCode(ret); if (ret != ERR_OK) { - APP_LOGE("ResetDefaultApplicationSync failed: %{public}d", ret); + APP_LOGE("ResetDefaultApplication failed: %{public}d", ret); napi_value businessError = BusinessError::CreateCommonError( env, ret, RESET_DEFAULT_APPLICATION_SYNC, Constants::PERMISSION_SET_DEFAULT_APPLICATION); napi_throw(env, businessError); diff --git a/interfaces/kits/js/free_install/free_install.cpp b/interfaces/kits/js/free_install/free_install.cpp index 77848fbfdba356f120609a72f70858d27c8c46c9..5a38de2e9d3eb0809f41a1e9ec753e81a56a0a2e 100644 --- a/interfaces/kits/js/free_install/free_install.cpp +++ b/interfaces/kits/js/free_install/free_install.cpp @@ -61,7 +61,7 @@ static ErrCode InnerIsHapModuleRemovable(const std::string &bundleName, } auto result = iBundleMgr->IsModuleRemovable(bundleName, moduleName, isRemovable); if (result != ERR_OK) { - APP_LOGE("InnerIsHapModuleRemovable::IsModuleRemovable failed, bundleName is %{public}s", bundleName.c_str()); + APP_LOGE("module remove failed, bundleName %{public}s", bundleName.c_str()); } return CommonFunc::ConvertErrCode(result); } @@ -81,7 +81,7 @@ void IsHapModuleRemovableComplete(napi_env env, napi_status status, void *data) { HapModuleRemovableCallbackInfo *asyncCallbackInfo = reinterpret_cast(data); if (asyncCallbackInfo == nullptr) { - APP_LOGE("asyncCallbackInfo is null in %{public}s", __func__); + APP_LOGE("asyncCallbackInfo is null %{public}s", __func__); return; } std::unique_ptr callbackPtr {asyncCallbackInfo}; @@ -151,7 +151,7 @@ static ErrCode InnerSetHapModuleUpgradeFlag(const std::string &bundleName, } auto result = iBundleMgr->SetModuleUpgradeFlag(bundleName, moduleName, upgradeFlag); if (result != ERR_OK) { - APP_LOGE("InnerSetHapModuleUpgradeFlag::SetModuleUpgradeFlag failed, bundleName is %{public}s", + APP_LOGE("module upgrade flag failed, bundleName %{public}s", bundleName.c_str()); } return CommonFunc::ConvertErrCode(result); @@ -174,7 +174,7 @@ void SetHapModuleUpgradeFlagComplete(napi_env env, napi_status status, void *dat SetHapModuleUpgradeFlagCallbackInfo *asyncCallbackInfo = reinterpret_cast(data); if (asyncCallbackInfo == nullptr) { - APP_LOGE("asyncCallbackInfo is null in %{public}s", __func__); + APP_LOGE("asyncCallbackInfo is null %{public}s", __func__); return; } std::unique_ptr callbackPtr {asyncCallbackInfo}; @@ -555,7 +555,7 @@ static ErrCode InnerGetBundlePackInfo(const std::string &bundleName, int32_t fla } auto ret = iBundleMgr->GetBundlePackInfo(bundleName, flags, bundlePackInfo); if (ret != ERR_OK) { - APP_LOGE("InnerGetBundlePackInfo failed, bundleName is %{public}s", bundleName.c_str()); + APP_LOGE("bundle pack info failed, bundleName %{public}s", bundleName.c_str()); } return CommonFunc::ConvertErrCode(ret); } @@ -576,7 +576,7 @@ void GetBundlePackInfoComplete(napi_env env, napi_status status, void *data) { GetBundlePackInfoCallbackInfo *asyncCallbackInfo = reinterpret_cast(data); if (asyncCallbackInfo == nullptr) { - APP_LOGE("asyncCallbackInfo is null in %{public}s", __func__); + APP_LOGE("asyncCallbackInfo is null %{public}s", __func__); return; } std::unique_ptr callbackPtr {asyncCallbackInfo}; @@ -689,7 +689,7 @@ void GetDispatchInfoComplete(napi_env env, napi_status status, void *data) { GetDispatchInfoCallbackInfo *asyncCallbackInfo = reinterpret_cast(data); if (asyncCallbackInfo == nullptr) { - APP_LOGE("asyncCallbackInfo is null in %{public}s", __func__); + APP_LOGE("asyncCallbackInfo is null %{public}s", __func__); return; } std::unique_ptr callbackPtr {asyncCallbackInfo}; diff --git a/interfaces/kits/js/installer/installer.cpp b/interfaces/kits/js/installer/installer.cpp index 361a75c5bf0d4f26f2d47de1b02d5148687e08fe..611ac145ce35ddfff5bd4be3fb3432bfef593d9f 100644 --- a/interfaces/kits/js/installer/installer.cpp +++ b/interfaces/kits/js/installer/installer.cpp @@ -184,14 +184,14 @@ napi_value GetBundleInstaller(napi_env env, napi_callback_info info) if (argc == SECOND_PARAM) { napi_value arg = args.GetArgv(argc - SECOND_PARAM); if (arg == nullptr) { - APP_LOGE("the param is nullptr"); + APP_LOGE("arg is nullptr"); BusinessError::ThrowTooFewParametersError(env, ERROR_PARAM_CHECK_ERROR); return nullptr; } napi_valuetype valuetype = napi_undefined; NAPI_CALL(env, napi_typeof(env, arg, &valuetype)); if (valuetype != napi_function) { - APP_LOGE("the param type is invalid"); + APP_LOGE("valuetype is invalid"); BusinessError::ThrowParameterTypeError(env, ERROR_PARAM_CHECK_ERROR, CALLBACK, FUNCTION_TYPE); return nullptr; } @@ -581,7 +581,7 @@ static bool ParseBundleName(napi_env env, napi_value args, std::string &bundleNa napi_value property = nullptr; bool res = CommonFunc::ParsePropertyFromObject(env, args, propertyInfo, property); if (!res) { - APP_LOGE("parse bundleName failed, bundleName is %{public}s", bundleName.c_str()); + APP_LOGE("parse bundleName failed, bundleName %{public}s", bundleName.c_str()); return res; } if (property != nullptr) { @@ -936,7 +936,7 @@ void InstallExecuter(napi_env env, void *data) APP_LOGD("InnerInstall resultMsg %{public}s", installResult.resultMsg.c_str()); return; } - APP_LOGE("install failed due to %{public}d", res); + APP_LOGE("install failed %{public}d", res); std::unordered_map proxyErrCodeMap; CreateProxyErrCode(proxyErrCodeMap); if (proxyErrCodeMap.find(res) != proxyErrCodeMap.end()) { @@ -1354,7 +1354,7 @@ void AddExtResourceExec(napi_env env, void *data) { ExtResourceCallbackInfo *asyncCallbackInfo = reinterpret_cast(data); if (asyncCallbackInfo == nullptr) { - APP_LOGE("asyncCallbackInfo is null in %{public}s", __func__); + APP_LOGE("asyncCallbackInfo is null %{public}s", __func__); return; } asyncCallbackInfo->err = InnerAddExtResource( @@ -1444,7 +1444,7 @@ void RemoveExtResourceExec(napi_env env, void *data) { ExtResourceCallbackInfo *asyncCallbackInfo = reinterpret_cast(data); if (asyncCallbackInfo == nullptr) { - APP_LOGE("asyncCallbackInfo is null in %{public}s", __func__); + APP_LOGE("asyncCallbackInfo is null %{public}s", __func__); return; } asyncCallbackInfo->err = InnerRemoveExtResource( @@ -1620,7 +1620,7 @@ void CreateAppCloneComplete(napi_env env, napi_status status, void *data) { CreateAppCloneCallbackInfo *asyncCallbackInfo = reinterpret_cast(data); if (asyncCallbackInfo == nullptr) { - APP_LOGE("asyncCallbackInfo is null in %{public}s", __func__); + APP_LOGE("asyncCallbackInfo is null %{public}s", __func__); return; } std::unique_ptr callbackPtr {asyncCallbackInfo}; @@ -1642,7 +1642,7 @@ void CreateAppCloneComplete(napi_env env, napi_status status, void *data) void ParseAppCloneParam(napi_env env, napi_value args, int32_t &userId, int32_t &appIndex) { if (!ParseUserId(env, args, userId)) { - APP_LOGI("parse userId failed. assign a default value = %{public}d.", userId); + APP_LOGI("assign default value %{public}d.", userId); } if (ParseAppIndex(env, args, appIndex)) { if (appIndex == 0) { @@ -1735,7 +1735,7 @@ void DestroyAppCloneComplete(napi_env env, napi_status status, void *data) { CreateAppCloneCallbackInfo *asyncCallbackInfo = reinterpret_cast(data); if (asyncCallbackInfo == nullptr) { - APP_LOGE("asyncCallbackInfo is null in %{public}s", __func__); + APP_LOGE("asyncCallbackInfo is null %{public}s", __func__); return; } std::unique_ptr callbackPtr {asyncCallbackInfo}; diff --git a/interfaces/kits/js/launcher_bundle_manager/launcher_bundle_manager.cpp b/interfaces/kits/js/launcher_bundle_manager/launcher_bundle_manager.cpp index 741d93aecf0ef9415863eb72f7062789dd826d37..6e1a60a7941fb22cf6cb4157d2d6f0fa20016877 100644 --- a/interfaces/kits/js/launcher_bundle_manager/launcher_bundle_manager.cpp +++ b/interfaces/kits/js/launcher_bundle_manager/launcher_bundle_manager.cpp @@ -81,7 +81,7 @@ void GetLauncherAbilityInfoComplete(napi_env env, napi_status status, void *data { GetLauncherAbilityCallbackInfo *asyncCallbackInfo = reinterpret_cast(data); if (asyncCallbackInfo == nullptr) { - APP_LOGE("asyncCallbackInfo is null in %{public}s", __func__); + APP_LOGE("asyncCallbackInfo is null %{public}s", __func__); return; } std::unique_ptr callbackPtr {asyncCallbackInfo}; @@ -172,7 +172,7 @@ napi_value GetLauncherAbilityInfoSync(napi_env env, napi_callback_info info) ErrCode ret = CommonFunc::ConvertErrCode(launcherService-> GetLauncherAbilityByBundleName(bundleName, userId, launcherAbilityInfos)); if (ret != SUCCESS) { - APP_LOGE("GetLauncherAbilityByBundleName failed, bundleName is %{public}s, userId is %{public}d", + APP_LOGE("get launch ability failed, bundleName %{public}s, userId %{public}d", bundleName.c_str(), userId); napi_value businessError = BusinessError::CreateCommonError( env, ret, GET_LAUNCHER_ABILITY_INFO_SYNC, Constants::PERMISSION_GET_BUNDLE_INFO_PRIVILEGED); @@ -212,7 +212,7 @@ void GetAllLauncherAbilityInfoComplete(napi_env env, napi_status status, void *d { GetAllLauncherAbilityCallbackInfo *asyncCallbackInfo = reinterpret_cast(data); if (asyncCallbackInfo == nullptr) { - APP_LOGE("asyncCallbackInfo is null in %{public}s", __func__); + APP_LOGE("asyncCallbackInfo is null %{public}s", __func__); return; } std::unique_ptr callbackPtr {asyncCallbackInfo}; @@ -293,7 +293,7 @@ void GetShortcutInfoComplete(napi_env env, napi_status status, void *data) { GetShortcutInfoCallbackInfo *asyncCallbackInfo = reinterpret_cast(data); if (asyncCallbackInfo == nullptr) { - APP_LOGE("asyncCallbackInfo is null in %{public}s", __func__); + APP_LOGE("asyncCallbackInfo is null %{public}s", __func__); return; } std::unique_ptr callbackPtr {asyncCallbackInfo}; @@ -375,7 +375,7 @@ napi_value GetShortcutInfoSync(napi_env env, napi_callback_info info) std::vector shortcutInfos; ErrCode ret = CommonFunc::ConvertErrCode(launcherService->GetShortcutInfoV9(bundleName, shortcutInfos)); if (ret != SUCCESS) { - APP_LOGE("GetShortcutInfoV9 failed, bundleName is %{public}s", bundleName.c_str()); + APP_LOGE("get shortcut failed, bundleName %{public}s", bundleName.c_str()); napi_value businessError = BusinessError::CreateCommonError( env, ret, GET_SHORTCUT_INFO_SYNC, Constants::PERMISSION_GET_BUNDLE_INFO_PRIVILEGED); napi_throw(env, businessError); diff --git a/interfaces/kits/js/launchermgr/bundle_status_callback.cpp b/interfaces/kits/js/launchermgr/bundle_status_callback.cpp index 9776eb314ee316aca6ed25f4fa0105c69b09b941..f3f4a28ae1e967aae1b693e6484252cc884ee9b6 100644 --- a/interfaces/kits/js/launchermgr/bundle_status_callback.cpp +++ b/interfaces/kits/js/launchermgr/bundle_status_callback.cpp @@ -72,7 +72,7 @@ void BundleStatusCallback::OnBundleAdded(const std::string& bundleName, const in napi_get_uv_event_loop(env_, &loop); uv_work_t* work = new (std::nothrow) uv_work_t; if (work == nullptr) { - APP_LOGW("BundleStatusCallback OnBundleAdded work is nullptr bundleName : %{public}s", bundleName.c_str()); + APP_LOGW("work is nullptr bundleName : %{public}s", bundleName.c_str()); return; } AsyncCallbackInfo* asyncCallbackInfo = new (std::nothrow)AsyncCallbackInfo { @@ -82,14 +82,14 @@ void BundleStatusCallback::OnBundleAdded(const std::string& bundleName, const in .userId_ = userId, }; if (asyncCallbackInfo == nullptr) { - APP_LOGW("BundleStatusCallback OnBundleAdded asyncCallbackInfo is nullptr bundleName : %{public}s", + APP_LOGW("asyncCallbackInfo is nullptr bundleName : %{public}s", bundleName.c_str()); delete work; return; } work->data = reinterpret_cast(asyncCallbackInfo); if (loop == nullptr) { - APP_LOGW("BundleStatusCallback OnBundleAdded loop is nullptr bundleName : %{public}s", bundleName.c_str()); + APP_LOGW("loop is nullptr bundleName : %{public}s", bundleName.c_str()); delete work; return; } @@ -138,7 +138,7 @@ void BundleStatusCallback::OnBundleUpdated(const std::string& bundleName, const napi_get_uv_event_loop(env_, &loop); uv_work_t* work = new (std::nothrow) uv_work_t; if (work == nullptr) { - APP_LOGW("BundleStatusCallback OnBundleUpdated work is nullptr bundleName : %{public}s", bundleName.c_str()); + APP_LOGW("work is nullptr bundleName : %{public}s", bundleName.c_str()); return; } AsyncCallbackInfo* asyncCallbackInfo = new (std::nothrow) AsyncCallbackInfo { @@ -148,14 +148,14 @@ void BundleStatusCallback::OnBundleUpdated(const std::string& bundleName, const .userId_ = userId, }; if (asyncCallbackInfo == nullptr) { - APP_LOGW("BundleStatusCallback OnBundleUpdated asyncCallbackInfo is nullptr bundleName : %{public}s", + APP_LOGW("asyncCallbackInfo is nullptr bundleName : %{public}s", bundleName.c_str()); delete work; return; } work->data = reinterpret_cast(asyncCallbackInfo); if (loop == nullptr) { - APP_LOGW("BundleStatusCallback OnBundleUpdated loop is nullptr bundleName : %{public}s", bundleName.c_str()); + APP_LOGW("loop is nullptr bundleName : %{public}s", bundleName.c_str()); delete work; return; } @@ -207,7 +207,7 @@ void BundleStatusCallback::OnBundleRemoved(const std::string& bundleName, const napi_get_uv_event_loop(env_, &loop); uv_work_t* work = new (std::nothrow) uv_work_t; if (work == nullptr) { - APP_LOGW("BundleStatusCallback OnBundleRemoved work is nullptr bundleName : %{public}s", bundleName.c_str()); + APP_LOGW("work is nullptr bundleName : %{public}s", bundleName.c_str()); return; } AsyncCallbackInfo* asyncCallbackInfo = new (std::nothrow) AsyncCallbackInfo { @@ -217,14 +217,14 @@ void BundleStatusCallback::OnBundleRemoved(const std::string& bundleName, const .userId_ = userId, }; if (asyncCallbackInfo == nullptr) { - APP_LOGW("BundleStatusCallback OnBundleUpdated asyncCallbackInfo is nullptr bundleName : %{public}s", + APP_LOGW("asyncCallbackInfo is nullptr bundleName : %{public}s", bundleName.c_str()); delete work; return; } work->data = reinterpret_cast(asyncCallbackInfo); if (loop == nullptr) { - APP_LOGW("BundleStatusCallback OnBundleRemoved loop is nullptr bundleName : %{public}s", bundleName.c_str()); + APP_LOGW("loop is nullptr bundleName : %{public}s", bundleName.c_str()); delete work; return; } diff --git a/interfaces/kits/js/launchermgr/js_launcher.cpp b/interfaces/kits/js/launchermgr/js_launcher.cpp index 34b2eabc089cdc76e3a4da819a08bbd64a784b51..237266f133d5f11db2156c995e509b40abf52a7c 100644 --- a/interfaces/kits/js/launchermgr/js_launcher.cpp +++ b/interfaces/kits/js/launchermgr/js_launcher.cpp @@ -707,7 +707,7 @@ static bool InnerJSGetAllLauncherAbilityInfos(uint32_t userId, auto result = launcher->GetAllLauncherAbilityInfos(userId, launcherAbilityInfos); if (!result) { - APP_LOGE("GetAllLauncherAbilityInfos call error, userId is %{public}d", userId); + APP_LOGE("get all launch ability error, userId %{public}d", userId); return false; } return true; @@ -737,7 +737,7 @@ void JsGetAllLauncherAbilityInfoComplete(napi_env env, napi_status status, void JsGetAllLauncherAbilityCallbackInfo *asyncCallbackInfo = reinterpret_cast(data); if (asyncCallbackInfo == nullptr) { - APP_LOGE("asyncCallbackInfo is null in %{public}s", __func__); + APP_LOGE("asyncCallbackInfo is null %{public}s", __func__); return; } std::unique_ptr callbackPtr {asyncCallbackInfo}; @@ -805,7 +805,7 @@ static bool InnerJSGetLauncherAbilityInfos(napi_env env, std::string& bundleName auto result = launcher->GetAbilityList(bundleName, userId, launcherAbilityInfos); if (!result) { - APP_LOGE("GetAbilityList call error, bundleName is %{public}s, userId is %{public}d", + APP_LOGE("GetAbilityList call error, bundleName %{public}s, userId %{public}d", bundleName.c_str(), userId); return false; } diff --git a/interfaces/kits/js/overlay/js_app_overlay.cpp b/interfaces/kits/js/overlay/js_app_overlay.cpp index e24fcf758a6a8ed8614d1e2bfef2ed3e033eacc2..0f973084949f697456e1cadbd6aa16945bb5a6cb 100644 --- a/interfaces/kits/js/overlay/js_app_overlay.cpp +++ b/interfaces/kits/js/overlay/js_app_overlay.cpp @@ -81,7 +81,7 @@ void SetOverlayEnabledExec(napi_env env, void *data) { OverlayCallbackInfo *overlayCallbackInfo = reinterpret_cast(data); if (overlayCallbackInfo == nullptr) { - APP_LOGE("overlayCallbackInfo is null in %{public}s", __func__); + APP_LOGE("overlayCallbackInfo is null %{public}s", __func__); return; } if (overlayCallbackInfo->err == NO_ERROR) { @@ -93,7 +93,7 @@ void SetOverlayEnabledComplete(napi_env env, napi_status status, void *data) { OverlayCallbackInfo *overlayCallbackInfo = reinterpret_cast(data); if (overlayCallbackInfo == nullptr) { - APP_LOGE("overlayCallbackInfo is null in %{public}s", __func__); + APP_LOGE("overlayCallbackInfo is null %{public}s", __func__); return; } std::unique_ptr callbackPtr {overlayCallbackInfo}; @@ -101,7 +101,7 @@ void SetOverlayEnabledComplete(napi_env env, napi_status status, void *data) if (overlayCallbackInfo->err == NO_ERROR) { NAPI_CALL_RETURN_VOID(env, napi_get_null(env, &result[0])); } else { - APP_LOGE("SetOverlayEnabledComplete err = %{public}d", overlayCallbackInfo->err); + APP_LOGE("overlaycallbackinfo err = %{public}d", overlayCallbackInfo->err); result[0] = BusinessError::CreateCommonError(env, overlayCallbackInfo->err, SET_OVERLAY_ENABLED_BY_BUNDLE_NAME, Constants::PERMISSION_CHANGE_OVERLAY_ENABLED_STATE); } @@ -193,7 +193,7 @@ napi_value SetOverlayEnabledByBundleName(napi_env env, napi_callback_info info) } } else if (i == ARGS_POS_TWO) { if (!CommonFunc::ParseBool(env, args[i], overlayCallbackInfo->isEnabled)) { - APP_LOGE("isEnabled is %{public}d invalid!", overlayCallbackInfo->isEnabled); + APP_LOGE("isEnabled %{public}d invalid!", overlayCallbackInfo->isEnabled); BusinessError::ThrowParameterTypeError(env, ERROR_PARAM_CHECK_ERROR, IS_ENABLED, TYPE_BOOLEAN); return nullptr; } @@ -257,7 +257,7 @@ void GetOverlayModuleInfoExec(napi_env env, void *data) { OverlayCallbackInfo *overlayCbInfo = reinterpret_cast(data); if (overlayCbInfo == nullptr) { - APP_LOGE("overlayCbInfo is null in %{public}s", __func__); + APP_LOGE("overlayCbInfo is null %{public}s", __func__); return; } if (overlayCbInfo->err == NO_ERROR) { @@ -270,7 +270,7 @@ void GetOverlayModuleInfoComplete(napi_env env, napi_status status, void *data) { OverlayCallbackInfo *overlayCallbackInfo = reinterpret_cast(data); if (overlayCallbackInfo == nullptr) { - APP_LOGE("overlayCallbackInfo is null in %{public}s", __func__); + APP_LOGE("overlayCallbackInfo is null %{public}s", __func__); return; } std::unique_ptr callbackPtr {overlayCallbackInfo}; @@ -340,7 +340,7 @@ void GetTargetOverlayModuleInfosComplete(napi_env env, napi_status status, void { OverlayCallbackInfo *overlayCallbackInfo = reinterpret_cast(data); if (overlayCallbackInfo == nullptr) { - APP_LOGE("overlayCallbackInfo is null in %{public}s", __func__); + APP_LOGE("overlayCallbackInfo is null %{public}s", __func__); return; } std::unique_ptr callbackPtr {overlayCallbackInfo}; diff --git a/interfaces/kits/js/zip/napi/common/napi_async_work_callback.cpp b/interfaces/kits/js/zip/napi/common/napi_async_work_callback.cpp index ec3225906840d64934bb6990bd4f4aa909bccb79..566d33c2f415ddb4c9b79a022ef962d018b523d0 100644 --- a/interfaces/kits/js/zip/napi/common/napi_async_work_callback.cpp +++ b/interfaces/kits/js/zip/napi/common/napi_async_work_callback.cpp @@ -71,7 +71,7 @@ static void CallbackComplete(napi_env env, napi_status status, void *data) napi_get_global(env, &global); napi_status stat = napi_call_function(env, global, callback, argv.size(), argv.data(), &tmp); if (stat != napi_ok) { - APP_LOGE("Failed to call function for %{public}d", stat); + APP_LOGE("Failed to call for %{public}d", stat); } napi_close_handle_scope(env, scope); diff --git a/interfaces/kits/js/zip/napi/common/napi_class.cpp b/interfaces/kits/js/zip/napi/common/napi_class.cpp index fb3a488d547621a1ad931023b6cbf22eb29955ad..c4a491647062c3eb5323ab736578d8158e16d360 100644 --- a/interfaces/kits/js/zip/napi/common/napi_class.cpp +++ b/interfaces/kits/js/zip/napi/common/napi_class.cpp @@ -41,7 +41,7 @@ tuple NapiClass::DefineClass( properties.data(), &classVal); if (stat != napi_ok) { - APP_LOGE("INNER BUG. Cannot define class %{public}s because of %{public}d", className.c_str(), stat); + APP_LOGE("INNER BUG. Cannot define class %{public}s because %{public}d", className.c_str(), stat); } return {stat == napi_ok, classVal}; } @@ -60,7 +60,7 @@ bool NapiClass::SaveClass(napi_env env, const string &className, napi_value exCl if (res == napi_ok) { nClass.exClassMap.insert({className, constructor}); } else { - APP_LOGE("INNER BUG. Cannot ref class constructor %{public}s because of %{public}d", className.c_str(), res); + APP_LOGE("INNER BUG. Cannot ref class constructor %{public}s because %{public}d", className.c_str(), res); } return res == napi_ok; @@ -79,14 +79,14 @@ napi_value NapiClass::InstantiateClass(napi_env env, const string &className, co napi_value cons = nullptr; napi_status status = napi_get_reference_value(env, it->second, &cons); if (status != napi_ok) { - APP_LOGE("INNER BUG. Cannot deref class %{public}s because of %{public}d", className.c_str(), status); + APP_LOGE("INNER BUG. Cannot deref class %{public}s because %{public}d", className.c_str(), status); return nullptr; } napi_value instance = nullptr; status = napi_new_instance(env, cons, args.size(), args.data(), &instance); if (status != napi_ok) { - APP_LOGE("INNER BUG. Cannot instantiate the class %{public}s because of %{public}d", className.c_str(), status); + APP_LOGE("INNER BUG. Cannot instantiate the class %{public}s because %{public}d", className.c_str(), status); return nullptr; } diff --git a/interfaces/kits/js/zip/napi/common/napi_value.cpp b/interfaces/kits/js/zip/napi/common/napi_value.cpp index 3a1d6cde97551ab3ead4913bad794d6c431338a5..a6b906f03139d3d9fc2c22ebed2a4fb4340d1926 100644 --- a/interfaces/kits/js/zip/napi/common/napi_value.cpp +++ b/interfaces/kits/js/zip/napi/common/napi_value.cpp @@ -252,7 +252,7 @@ bool NapiValue::AddProp(vector &&propVec) const napi_status status = napi_define_properties(env_, val_, propVec.size(), propVec.data()); if (status != napi_ok) { - APP_LOGE("INNER BUG. Cannot define properties because of %{public}d", status); + APP_LOGE("INNER BUG. Cannot define properties because %{public}d", status); return false; } @@ -268,7 +268,7 @@ bool NapiValue::AddProp(const string &propName, napi_value val) const napi_status status = napi_set_named_property(env_, val_, propName.c_str(), val); if (status != napi_ok) { - APP_LOGE("INNER BUG. Cannot set named property because of %{public}d", status); + APP_LOGE("INNER BUG. Cannot set named property because %{public}d", status); return false; } diff --git a/interfaces/kits/js/zip/napi/napi_zlib.cpp b/interfaces/kits/js/zip/napi/napi_zlib.cpp index efd56d8adcb4bb9332fbeb7c5e3c181415fc689f..6305360654a3a629d10a8dead928e69b2def7674 100755 --- a/interfaces/kits/js/zip/napi/napi_zlib.cpp +++ b/interfaces/kits/js/zip/napi/napi_zlib.cpp @@ -399,7 +399,7 @@ AsyncZipCallbackInfo *CreateZipAsyncCallbackInfo(napi_env env) if (ret != napi_ok) { napi_get_last_error_info(env, &errorInfo); if (errorInfo == nullptr) { - APP_LOGE("%{public}s errorInfo is null", __func__); + APP_LOGE("%{public}s errorInfo null", __func__); return nullptr; } APP_LOGE("%{public}s get_global=%{public}d err:%{public}s", __func__, ret, errorInfo->error_message); @@ -410,7 +410,7 @@ AsyncZipCallbackInfo *CreateZipAsyncCallbackInfo(napi_env env) .zlibCallbackInfo = nullptr, }; if (asyncCallbackInfo == nullptr) { - APP_LOGE("%{public}s asyncCallbackInfo is null", __func__); + APP_LOGE("%{public}s asyncCallbackInfo null", __func__); return nullptr; } APP_LOGD("%{public}s end.", __func__); @@ -428,20 +428,20 @@ napi_value UnwrapStringParam(std::string &str, napi_env env, napi_value argv) } if (valueType != napi_valuetype::napi_string) { - APP_LOGI("%{public}s called, Parameter type does not match", __func__); + APP_LOGI("%{public}s Parameter type does not match", __func__); return nullptr; } size_t len; napi_status status = napi_get_value_string_utf8(env, argv, nullptr, 0, &len); if (status != napi_ok) { - APP_LOGI("%{public}s called, Get locale tag length failed", __func__); + APP_LOGI("%{public}s Get locale tag length failed", __func__); return nullptr; } std::vector buf(len + 1); status = napi_get_value_string_utf8(env, argv, buf.data(), len + 1, &len); if (status != napi_ok) { - APP_LOGI("%{public}s called, Get locale tag failed", __func__); + APP_LOGI("%{public}s Get locale tag failed", __func__); return nullptr; } str = std::string(buf.data()); @@ -463,14 +463,14 @@ napi_value UnwrapStringArrayParam(std::vector &stringArray, napi_en bool isArray = false; if (napi_is_array(env, argv, &isArray) != napi_ok || !isArray) { - APP_LOGI("%{public}s called, Parameter type does not match", __func__); + APP_LOGI("%{public}s Parameter type does not match", __func__); return nullptr; } uint32_t size = 0U; napi_status status = napi_get_array_length(env, argv, &size); if (status != napi_ok || size == 0U) { - APP_LOGI("%{public}s called, Get string array length failed", __func__); + APP_LOGI("%{public}s Get string array length failed", __func__); return nullptr; } @@ -478,20 +478,20 @@ napi_value UnwrapStringArrayParam(std::vector &stringArray, napi_en for (uint32_t i = 0; i < size; i++) { status = napi_get_element(env, argv, i, &result); if (status != napi_ok) { - APP_LOGI("%{public}s called, Get locale tag element failed", __func__); + APP_LOGI("%{public}s Get locale tag element failed", __func__); return nullptr; } size_t strLen = 0; status = napi_get_value_string_utf8(env, result, nullptr, 0, &strLen); if (status != napi_ok) { - APP_LOGI("%{public}s called, Get locale tag length failed", __func__); + APP_LOGI("%{public}s Get locale tag length failed", __func__); return nullptr; } std::vector buf(strLen + 1); status = napi_get_value_string_utf8(env, result, buf.data(), strLen + 1, &strLen); if (status != napi_ok) { - APP_LOGI("%{public}s called, Get locale tag failed", __func__); + APP_LOGI("%{public}s Get locale tag failed", __func__); return nullptr; } stringArray.push_back(std::string(buf.data())); @@ -562,25 +562,25 @@ napi_value UnwrapZipParam(CallZipUnzipParam ¶m, napi_env env, napi_value *ar APP_LOGD("%{public}s,called", __func__); size_t argcPromise = 3; if (argc < argcPromise) { - APP_LOGI("%{public}s called, param count is wrong", __func__); + APP_LOGI("%{public}s param count is wrong", __func__); return nullptr; } // unwrap the param[0] if (UnwrapStringParam(param.src, env, args[0]) == nullptr) { - APP_LOGI("%{public}s called, args[0] error", __func__); + APP_LOGI("%{public}s args[0] error", __func__); return nullptr; } // unwrap the param[1] if (UnwrapStringParam(param.dest, env, args[1]) == nullptr) { - APP_LOGI("%{public}s called, args[1] error", __func__); + APP_LOGI("%{public}s args[1] error", __func__); return nullptr; } // unwrap the param[2] if (!UnwrapOptionsParams(param.options, env, args[2])) { - APP_LOGI("%{public}s called, args[2] error", __func__); + APP_LOGI("%{public}s args[2] error", __func__); return nullptr; } // create reutrn @@ -655,7 +655,7 @@ napi_value ZipFileWrap(napi_env env, napi_callback_info info, AsyncZipCallbackIn return nullptr; } if (thisArg == nullptr) { - APP_LOGE("%{public}s, This argument is nullptr.", __func__); + APP_LOGE("%{public}s, This argument nullptr.", __func__); return nullptr; } napi_valuetype valueTypeOfThis = napi_undefined;