From ce381c34c9839f969a70bbdb5411d96546f01e26 Mon Sep 17 00:00:00 2001 From: changzheng6 Date: Mon, 30 May 2022 20:41:57 +0800 Subject: [PATCH] modify napi warn Signed-off-by: changzheng6 --- .../distributed_bundle_mgr.cpp | 10 ++++---- interfaces/kits/js/bundlemgr/bundle_mgr.cpp | 24 +++++++++---------- .../kits/js/launchermgr/js_launcher.cpp | 2 +- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/distributed_bundle_framework/interfaces/kits/js/distributebundlemgr/distributed_bundle_mgr.cpp b/distributed_bundle_framework/interfaces/kits/js/distributebundlemgr/distributed_bundle_mgr.cpp index 1b977b35bb..b427de5d7c 100644 --- a/distributed_bundle_framework/interfaces/kits/js/distributebundlemgr/distributed_bundle_mgr.cpp +++ b/distributed_bundle_framework/interfaces/kits/js/distributebundlemgr/distributed_bundle_mgr.cpp @@ -208,7 +208,7 @@ static bool ParseElementName(napi_env env, OHOS::AppExecFwk::ElementName &elemen APP_LOGD("begin to parse ElementName"); napi_status status; napi_valuetype valueType; - NAPI_CALL(env, napi_typeof(env, args, &valueType)); + NAPI_CALL_BASE(env, napi_typeof(env, args, &valueType), false); if (valueType != napi_object) { APP_LOGE("args not object type"); return false; @@ -253,19 +253,19 @@ static bool ParseElementNames(napi_env env, std::vector &elementNam { APP_LOGD("begin to parse ElementNames"); bool isArray = false; - NAPI_CALL(env, napi_is_array(env, args, &isArray)); + NAPI_CALL_BASE(env, napi_is_array(env, args, &isArray), false); if (!isArray) { APP_LOGE("parseElementNames args not array"); return false; } uint32_t arrayLength = 0; - NAPI_CALL(env, napi_get_array_length(env, args, &arrayLength)); + NAPI_CALL_BASE(env, napi_get_array_length(env, args, &arrayLength), false); APP_LOGD("arrayLength:%{public}d", arrayLength); for (uint32_t i = 0; i < arrayLength; i++) { napi_value value = nullptr; - NAPI_CALL(env, napi_get_element(env, args, i, &value)); + NAPI_CALL_BASE(env, napi_get_element(env, args, i, &value), false); napi_valuetype valueType = napi_undefined; - NAPI_CALL(env, napi_typeof(env, value, &valueType)); + NAPI_CALL_BASE(env, napi_typeof(env, value, &valueType), false); if (valueType != napi_object) { APP_LOGE("array inside not object type"); elementNames.clear(); diff --git a/interfaces/kits/js/bundlemgr/bundle_mgr.cpp b/interfaces/kits/js/bundlemgr/bundle_mgr.cpp index f4bc9b2a1b..8895c8537a 100644 --- a/interfaces/kits/js/bundlemgr/bundle_mgr.cpp +++ b/interfaces/kits/js/bundlemgr/bundle_mgr.cpp @@ -1378,7 +1378,7 @@ static bool ParseBundleOptions(napi_env env, BundleOptions &bundleOptions, napi_ { APP_LOGD("begin to parse bundleOptions"); napi_valuetype valueType; - NAPI_CALL(env, napi_typeof(env, args, &valueType)); + NAPI_CALL_BASE(env, napi_typeof(env, args, &valueType), false); if (valueType != napi_object) { APP_LOGE("args not object type"); return false; @@ -1397,7 +1397,7 @@ static bool ParseWant(napi_env env, Want &want, napi_value args) { APP_LOGD("begin to parse want"); napi_valuetype valueType; - NAPI_CALL(env, napi_typeof(env, args, &valueType)); + NAPI_CALL_BASE(env, napi_typeof(env, args, &valueType), false); if (valueType != napi_object) { APP_LOGE("args not object type"); return false; @@ -1726,7 +1726,7 @@ static bool HasModuleName(napi_env env, size_t argc, napi_value *argv) bool hasModuleName = false; if (argc > 0) { napi_valuetype valueType = napi_undefined; - NAPI_CALL(env, napi_typeof(env, argv[argc - 1], &valueType)); + NAPI_CALL_BASE(env, napi_typeof(env, argv[argc - 1], &valueType), false); if (valueType == napi_function) { hasModuleName = (argc == ARGS_SIZE_FOUR) ? true : false; } else { @@ -3022,7 +3022,7 @@ napi_value GetBundleInstaller(napi_env env, napi_callback_info info) static bool ParseHashParam(napi_env env, std::string &key, std::string &value, napi_value args) { napi_valuetype valueType; - NAPI_CALL(env, napi_typeof(env, args, &valueType)); + NAPI_CALL_BASE(env, napi_typeof(env, args, &valueType), false); if (valueType != napi_object) { APP_LOGE("args type incorrect!"); return false; @@ -3073,17 +3073,17 @@ static bool ParseHashParams(napi_env env, std::map &ha uint32_t arrayLength = 0; napi_value valueAry = 0; napi_valuetype valueAryType = napi_undefined; - NAPI_CALL(env, napi_is_array(env, args, &isArray)); + NAPI_CALL_BASE(env, napi_is_array(env, args, &isArray), false); if (!isArray) { APP_LOGE("hashParams is not array!"); return false; } - NAPI_CALL(env, napi_get_array_length(env, args, &arrayLength)); + NAPI_CALL_BASE(env, napi_get_array_length(env, args, &arrayLength), false); APP_LOGD("ParseHashParams property is array, length=%{public}ud", arrayLength); for (uint32_t j = 0; j < arrayLength; j++) { - NAPI_CALL(env, napi_get_element(env, args, j, &valueAry)); - NAPI_CALL(env, napi_typeof(env, valueAry, &valueAryType)); + NAPI_CALL_BASE(env, napi_get_element(env, args, j, &valueAry), false); + NAPI_CALL_BASE(env, napi_typeof(env, valueAry, &valueAryType), false); std::string key; std::string value; if (!ParseHashParam(env, key, value, valueAry)) { @@ -3105,7 +3105,7 @@ static bool ParseHashParams(napi_env env, std::map &ha static bool ParseInstallParam(napi_env env, InstallParam &installParam, napi_value args) { napi_valuetype valueType; - NAPI_CALL(env, napi_typeof(env, args, &valueType)); + NAPI_CALL_BASE(env, napi_typeof(env, args, &valueType), false); if (valueType != napi_object) { APP_LOGE("args type incorrect!"); return false; @@ -3129,7 +3129,7 @@ static bool ParseInstallParam(napi_env env, InstallParam &installParam, napi_val } int userId = Constants::UNSPECIFIED_USERID; - NAPI_CALL(env, napi_get_value_int32(env, property, &userId)); + NAPI_CALL_BASE(env, napi_get_value_int32(env, property, &userId), false); if (userId < Constants::DEFAULT_USERID) { APP_LOGE("param userId(%{public}d) is invalid.", userId); return false; @@ -3155,7 +3155,7 @@ static bool ParseInstallParam(napi_env env, InstallParam &installParam, napi_val } int installFlag = 0; - NAPI_CALL(env, napi_get_value_int32(env, property, &installFlag)); + NAPI_CALL_BASE(env, napi_get_value_int32(env, property, &installFlag), false); installParam.installFlag = static_cast(installFlag); } APP_LOGI("ParseInstallParam installFlag=%{public}d.", installParam.installFlag); @@ -3177,7 +3177,7 @@ static bool ParseInstallParam(napi_env env, InstallParam &installParam, napi_val } bool isKeepData = false; - NAPI_CALL(env, napi_get_value_bool(env, property, &isKeepData)); + NAPI_CALL_BASE(env, napi_get_value_bool(env, property, &isKeepData), false); installParam.isKeepData = isKeepData; } APP_LOGI("ParseInstallParam isKeepData=%{public}d.", installParam.isKeepData); diff --git a/interfaces/kits/js/launchermgr/js_launcher.cpp b/interfaces/kits/js/launchermgr/js_launcher.cpp index 645ae20ead..2305846196 100644 --- a/interfaces/kits/js/launchermgr/js_launcher.cpp +++ b/interfaces/kits/js/launchermgr/js_launcher.cpp @@ -84,7 +84,7 @@ static bool ParseBundleStatusCallback(napi_env env, APP_LOGD("parse bundleStatusCallback begin"); napi_status status; napi_valuetype valueType; - NAPI_CALL(env, napi_typeof(env, args, &valueType)); + NAPI_CALL_BASE(env, napi_typeof(env, args, &valueType), false); if (valueType != napi_object) { APP_LOGE("param type mismatch!"); return false; -- Gitee