From 7a683111976bb7e3186b00cc6f31cf7a208de410 Mon Sep 17 00:00:00 2001 From: hekun Date: Wed, 16 Nov 2022 17:31:55 +0800 Subject: [PATCH] fix the code check two Signed-off-by: hekun --- .../entry/src/main/cpp/napi/napi_test.cpp | 75 ++++++++++--------- 1 file changed, 39 insertions(+), 36 deletions(-) diff --git a/arkui/ace_napi_test/entry/src/main/cpp/napi/napi_test.cpp b/arkui/ace_napi_test/entry/src/main/cpp/napi/napi_test.cpp index 9cf15cc76..fdd982b43 100644 --- a/arkui/ace_napi_test/entry/src/main/cpp/napi/napi_test.cpp +++ b/arkui/ace_napi_test/entry/src/main/cpp/napi/napi_test.cpp @@ -1324,8 +1324,8 @@ static napi_value TestLatin1(napi_env env, napi_callback_info info) { return output; } // test the napi function -static napi_value napCreateArrayBuffer(napi_env env, napi_callback_info info) { - +static napi_value napCreateArrayBuffer(napi_env env, napi_callback_info info) +{ napi_value arrayBuffer = nullptr; void* arrayBufferPtr = nullptr; size_t arrayBufferSize = 1024; @@ -1336,8 +1336,8 @@ static napi_value napCreateArrayBuffer(napi_env env, napi_callback_info info) { return arrayBuffer; } -static napi_value naiGetArrayBufferInfo(napi_env env, napi_callback_info info) { - +static napi_value naiGetArrayBufferInfo(napi_env env, napi_callback_info info) +{ // the value to return napi_value arrayBuffer; napi_status status; @@ -1358,8 +1358,8 @@ static napi_value naiGetArrayBufferInfo(napi_env env, napi_callback_info info) { return arrayLength; } -static napi_value napiNewInstance(napi_env env, napi_callback_info info) { - +static napi_value napiNewInstance(napi_env env, napi_callback_info info) +{ // the value to return napi_value global, constructor, arg, value; napi_status status = napi_get_global(env, &global); @@ -1375,8 +1375,8 @@ static napi_value napiNewInstance(napi_env env, napi_callback_info info) { return value; } -static napi_value napiDefineClass(napi_env env, napi_callback_info info) { - +static napi_value napiDefineClass(napi_env env, napi_callback_info info) +{ napi_value testWrapClass = nullptr; napi_define_class(env, "TestWrapClass", NAPI_AUTO_LENGTH, [](napi_env env, napi_callback_info info) -> napi_value { napi_value thisVar = nullptr; @@ -1393,7 +1393,8 @@ static napi_value napiDefineClass(napi_env env, napi_callback_info info) { return value; } -static napi_value napiRunScriptPath(napi_env env, napi_callback_info info) { +static napi_value napiRunScriptPath(napi_env env, napi_callback_info info) +{ napi_value value; char const* path = "/index/name"; napi_status status = napi_run_script_path(env, path, &value); @@ -1405,8 +1406,8 @@ static napi_value napiRunScriptPath(napi_env env, napi_callback_info info) { return _value; } -static napi_value napiGetNodeVersion(napi_env env, napi_callback_info info) { - +static napi_value napiGetNodeVersion(napi_env env, napi_callback_info info) +{ napi_value value; const napi_node_version* version; napi_get_node_version(env, &version); @@ -1419,8 +1420,8 @@ static napi_value napiGetNodeVersion(napi_env env, napi_callback_info info) { return _value; } -static napi_value napiCallThreadsafeFunction(napi_env env, napi_callback_info info) { - +static napi_value napiCallThreadsafeFunction(napi_env env, napi_callback_info info) +{ void *data = nullptr; napi_threadsafe_function func = (napi_threadsafe_function)data; napi_threadsafe_function_call_mode blockMode = napi_tsfn_nonblocking; @@ -1438,20 +1439,20 @@ static napi_value napiCallThreadsafeFunction(napi_env env, napi_callback_info in return value; } -static void TsFuncFinalTotalFour(napi_env env, void* finalizeData, void* hint) { - +static void TsFuncFinalTotalFour(napi_env env, void* finalizeData, void* hint) +{ static uv_thread_t g_uvThreadTest7; uv_thread_join(&g_uvThreadTest7); } -static void TsFuncCallJsFour(napi_env env, napi_value tsfn_cb, void* context, void* data) { - +static void TsFuncCallJsFour(napi_env env, napi_value tsfn_cb, void* context, void* data) +{ int* pData = (int32_t*)data; printf("TsFuncCallJsFour is %p \n", pData); } -static napi_value napiCreateThreadsafeFunction(napi_env env, napi_callback_info info) { - +static napi_value napiCreateThreadsafeFunction(napi_env env, napi_callback_info info) +{ napi_threadsafe_function tsFunc = nullptr; napi_value resourceName = 0; napi_create_string_latin1(env, __func__, NAPI_AUTO_LENGTH, &resourceName); @@ -1471,8 +1472,8 @@ static napi_value napiCreateThreadsafeFunction(napi_env env, napi_callback_info return _value; } -static napi_value napiCancelAsyncWork(napi_env env, napi_callback_info info) { - +static napi_value napiCancelAsyncWork(napi_env env, napi_callback_info info) +{ napi_async_work work = nullptr; napi_value resourceName = nullptr; napi_create_string_utf8(env, "AsyncWorkTest", NAPI_AUTO_LENGTH, &resourceName); @@ -1489,14 +1490,15 @@ static napi_value napiCancelAsyncWork(napi_env env, napi_callback_info info) { return value; } -static napi_value SayHello(napi_env env, napi_callback_info info) { +static napi_value SayHello(napi_env env, napi_callback_info info) +{ printf("Hello\n"); return NULL; } -static napi_value napiCreateFunction(napi_env env, napi_callback_info info) { - +static napi_value napiCreateFunction(napi_env env, napi_callback_info info) +{ napi_value funcValue = nullptr; napi_status status = napi_create_function(env, NULL, 0, SayHello, NULL, &funcValue); NAPI_ASSERT(env, status != napi_ok, "napi_create_function fail"); @@ -1507,15 +1509,15 @@ static napi_value napiCreateFunction(napi_env env, napi_callback_info info) { } -static napi_value napiRefthreadSafeFunction(napi_env env, napi_callback_info info) { - +static napi_value napiRefthreadSafeFunction(napi_env env, napi_callback_info info) +{ napi_threadsafe_function tsFunc = nullptr; napi_value resourceName = 0; napi_create_string_latin1(env, __func__, NAPI_AUTO_LENGTH, &resourceName); int32_t CALL_JS_CB_DATA_TEST_ID = 101; int32_t FINAL_CB_DATA_TEST_ID = 1001; napi_status status = napi_create_threadsafe_function(env, nullptr, nullptr, resourceName, - 0, 1, &CALL_JS_CB_DATA_TEST_ID, TsFuncFinalTotalFour, &FINAL_CB_DATA_TEST_ID , TsFuncCallJsFour, &tsFunc); + 0, 1, &CALL_JS_CB_DATA_TEST_ID, TsFuncFinalTotalFour, &FINAL_CB_DATA_TEST_ID , TsFuncCallJsFour, &tsFunc); NAPI_ASSERT(env, status == napi_ok, "napi_create_threadsafe_function"); status = napi_ref_threadsafe_function(env, tsFunc); @@ -1526,8 +1528,8 @@ static napi_value napiRefthreadSafeFunction(napi_env env, napi_callback_info inf return _value; } -static napi_value napiCreateDate(napi_env env, napi_callback_info info) { - +static napi_value napiCreateDate(napi_env env, napi_callback_info info) +{ napi_value createResult = nullptr; double time = 202110181203150; napi_status status = napi_create_date(env, time, &createResult); @@ -1544,8 +1546,8 @@ static napi_value napiCreateDate(napi_env env, napi_callback_info info) { return value; } -static napi_value napiCreateBigintUint64(napi_env env, napi_callback_info info) { - +static napi_value napiCreateBigintUint64(napi_env env, napi_callback_info info) +{ uint64_t testValue = UINT64_MAX; napi_value result = nullptr; napi_create_bigint_uint64(env, testValue, &result); @@ -1573,8 +1575,8 @@ static napi_value napiCreateBigintInt64(napi_env env, napi_callback_info info) { return value; } -static napi_value napiCreateBigintWords(napi_env env, napi_callback_info info) { - +static napi_value napiCreateBigintWords(napi_env env, napi_callback_info info) +{ int signBit = 0; size_t wordCount = 4; uint64_t words[] = { 0xFFFFFFFFFFFFFFFF, 34ULL, 56ULL, 0xFFFFFFFFFFFFFFFF }; @@ -1592,8 +1594,8 @@ static napi_value napiCreateBigintWords(napi_env env, napi_callback_info info) { return value; } -static napi_value napiFatalerror(napi_env env, napi_callback_info info) { - +static napi_value napiFatalerror(napi_env env, napi_callback_info info) +{ void *data = nullptr; napi_threadsafe_function tsfun = static_cast(data); if (napi_release_threadsafe_function(tsfun, napi_tsfn_release) == napi_ok) { @@ -1602,7 +1604,7 @@ static napi_value napiFatalerror(napi_env env, napi_callback_info info) { napi_value _value; NAPI_CALL(env, napi_create_int32(env, 0, &_value)); - return _value; + return _value; } @@ -1706,6 +1708,7 @@ static napi_value Init(napi_env env, napi_value exports) { NAPI_CALL(env, napi_define_properties(env, exports, sizeof(properties) / sizeof(properties[0]), properties)); return exports; } + EXTERN_C_END static napi_module -- GitLab