Skip to content

C
communication_ipc

OpenHarmony / communication_ipc
9 个月 前同步成功

通知 20
Star 3
Fork 0
C
communication_ipc

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 c37eac00 编写于 作者: L lishengming14
浏览文件
操作

魔数修改，关于使用napi时定义数组时使用的魔数 

Signed-off-by: Nlishengming14 <lishengming14@huawei.com>
上级 411197d9
展开全部 隐藏空白更改
内联 并排
Showing with 158 addition and 133 deletion
ipc/native/src/napi/src/napi_ipc_skeleton.cpp
浏览文件 @ c37eac00
......@@ -29,7 +29,10 @@ static constexpr OHOS::HiviewDFX::HiLogLabel LOG_LABEL = { LOG_CORE, LOG_ID_IPC,
static NapiError napiErr;
static const size_t ARGV_INDEX_0 = 0;
static const size_t ARGV_INDEX_1 = 1;
// static const size_t ARGV_INDEX_1 = 1;
static const size_t ARGV_LENGTH_1 = 1;
// static const size_t ARGV_LENGTH_2 = 2;
static constexpr size_t UINT64_STRING_MAX_LEN = 20;
napi_value NAPI_IPCSkeleton_getContextObject(napi_env env, napi_callback_info info)
......@@ -136,7 +139,7 @@ napi_value NAPI_IPCSkeleton_isLocalCalling(napi_env env, napi_callback_info info
napi_value NAPI_IPCSkeleton_flushCommands(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = {0};
napi_value argv[ARGV_LENGTH_1] = {0};
napi_value thisVar = nullptr;
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......@@ -156,7 +159,7 @@ napi_value NAPI_IPCSkeleton_flushCommands(napi_env env, napi_callback_info info)
napi_value NAPI_IPCSkeleton_flushCmdBuffer(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = {0};
napi_value argv[ARGV_LENGTH_1] = {0};
napi_value thisVar = nullptr;
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......@@ -283,7 +286,7 @@ napi_value NAPI_IPCSkeleton_setCallingIdentity(napi_env env, napi_callback_info
size_t argc = 1;
size_t expectedArgc = 1;
napi_value argv[1] = { 0 };
napi_value argv[ARGV_LENGTH_1] = { 0 };
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT_BASE(env, argc == expectedArgc, "requires 1 parameters", retValue);
......@@ -423,7 +426,7 @@ napi_value NAPI_IPCSkeleton_restoreCallingIdentity(napi_env env, napi_callback_i
size_t argc = 1;
size_t expectedArgc = 1;
napi_value argv[ARGV_INDEX_1] = { 0 };
napi_value argv[ARGV_LENGTH_1] = { 0 };
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
if (argc != expectedArgc) {
......
ipc/native/src/napi/src/napi_message_option.cpp
浏览文件 @ c37eac00
......@@ -25,6 +25,9 @@ static constexpr OHOS::HiviewDFX::HiLogLabel LOG_LABEL = { LOG_CORE, LOG_ID_IPC,
static const size_t ARGV_INDEX_0 = 0;
static const size_t ARGV_INDEX_1 = 1;
static const size_t ARGV_LENGTH_1 = 1;
static const size_t ARGV_LENGTH_2 = 2;
/*
* Get flags field from ohos.rpc.MessageOption.
*/
......@@ -50,7 +53,7 @@ static napi_value NapiOhosRpcMessageOptionSetFlags(napi_env env, napi_callback_i
{
napi_value thisVar = nullptr;
size_t argc = 1;
napi_value argv[1] = { 0 };
napi_value argv[ARGV_LENGTH_1] = { 0 };
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT(env, thisVar != nullptr, "failed to get js message option object");
napi_valuetype valueType = napi_null;
......@@ -93,7 +96,7 @@ static napi_value NapiOhosRpcMessageOptionSetAsync(napi_env env, napi_callback_i
{
napi_value thisVar = nullptr;
size_t argc = 1;
napi_value argv[1] = { 0 };
napi_value argv[ARGV_LENGTH_1] = { 0 };
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT(env, thisVar != nullptr, "failed to get js message option object");
napi_valuetype valueType = napi_null;
......@@ -136,7 +139,7 @@ static napi_value NapiOhosRpcMessageOptionSetWaittime(napi_env env, napi_callbac
{
napi_value thisVar = nullptr;
size_t argc = 1;
napi_value argv[1] = { 0 };
napi_value argv[ARGV_LENGTH_1] = { 0 };
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT(env, thisVar != nullptr, "failed to get js message option object");
napi_valuetype valueType = napi_null;
......@@ -157,7 +160,7 @@ static napi_value NapiOhosRpcMessageOptionSetWaittime(napi_env env, napi_callbac
static napi_value NAPIMessageOption_JS_Constructor(napi_env env, napi_callback_info info)
{
size_t argc = 2;
napi_value argv[2] = { 0 };
napi_value argv[ARGV_LENGTH_2] = { 0 };
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
......
ipc/native/src/napi/src/napi_remote_proxy.cpp
浏览文件 @ c37eac00
......@@ -43,6 +43,11 @@ static const size_t ARGV_INDEX_2 = 2;
static const size_t ARGV_INDEX_3 = 3;
static const size_t ARGV_INDEX_4 = 4;
// static const size_t ARGV_LENGTH_1 = 1;
static const size_t ARGV_LENGTH_2 = 2;
// static const size_t ARGV_LENGTH_3 = 3;
// static const size_t ARGV_LENGTH_4 = 4;
static const size_t ARGV_LENGTH_5 = 5;
void ExecuteSendRequest(napi_env env, void *data)
{
SendRequestParam *param = reinterpret_cast<SendRequestParam *>(data);
......@@ -187,7 +192,7 @@ napi_value NAPI_RemoteProxy_sendRequest(napi_env env, napi_callback_info info)
size_t argc = 4;
size_t argcCallback = 5;
size_t argcPromise = 4;
napi_value argv[5] = { 0 };
napi_value argv[ARGV_LENGTH_5] = { 0 };
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT(env, argc == argcPromise || argc == argcCallback, "requires 4 or 5 parameters");
......@@ -284,7 +289,7 @@ napi_value NAPI_RemoteProxy_sendMessageRequest(napi_env env, napi_callback_info
size_t argc = 4;
size_t argcCallback = 5;
size_t argcPromise = 4;
napi_value argv[5] = { 0 };
napi_value argv[ARGV_LENGTH_5] = { 0 };
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
if (argc != argcPromise && argc != argcCallback) {
......@@ -345,7 +350,7 @@ napi_value NAPI_RemoteProxy_addDeathRecipient(napi_env env, napi_callback_info i
ZLOGI(LOG_LABEL, "add death recipient");
size_t argc = 2;
size_t expectedArgc = 2;
napi_value argv[2] = { 0 };
napi_value argv[ARGV_LENGTH_2] = { 0 };
napi_value thisVar = nullptr;
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......@@ -418,7 +423,7 @@ napi_value NAPI_RemoteProxy_registerDeathRecipient(napi_env env, napi_callback_i
{
ZLOGI(LOG_LABEL, "register death recipient");
size_t argc = 2;
napi_value argv[2] = { 0 };
napi_value argv[ARGV_LENGTH_2] = { 0 };
napi_value thisVar = nullptr;
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......@@ -466,7 +471,7 @@ napi_value NAPI_RemoteProxy_removeDeathRecipient(napi_env env, napi_callback_inf
{
ZLOGI(LOG_LABEL, "remove death recipient");
size_t argc = 2;
napi_value argv[2] = { 0 };
napi_value argv[ARGV_LENGTH_2] = { 0 };
napi_value thisVar = nullptr;
void *data = nullptr;
size_t expectedArgc = 2;
......@@ -546,7 +551,7 @@ napi_value NAPI_RemoteProxy_unregisterDeathRecipient(napi_env env, napi_callback
{
ZLOGI(LOG_LABEL, "unregister death recipient");
size_t argc = 2;
napi_value argv[2] = { 0 };
napi_value argv[ARGV_LENGTH_2] = { 0 };
napi_value thisVar = nullptr;
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......
ipc/native/src/napi_common/source/napi_ashmem.cpp
浏览文件 @ c37eac00
......@@ -33,6 +33,9 @@ static const size_t ARGV_INDEX_0 = 0;
static const size_t ARGV_INDEX_1 = 1;
static const size_t ARGV_INDEX_2 = 2;
static const size_t ARGV_LENGTH_1 = 1;
static const size_t ARGV_LENGTH_2 = 2;
static const size_t ARGV_LENGTH_3 = 3;
NAPIAshmem::NAPIAshmem(sptr<Ashmem> &ashmem) : ashmem_(ashmem)
{
if (ashmem == nullptr) {
......@@ -57,7 +60,7 @@ napi_value NAPIAshmem::CreateAshmem(napi_env env, napi_callback_info info)
{
napi_value thisVar = nullptr;
size_t argc = 2;
napi_value argv[2] = { 0 };
napi_value argv[ARGV_LENGTH_2] = { 0 };
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT(env, argc == 2, "requires 2 parameter");
napi_valuetype valueType = napi_null;
......@@ -98,7 +101,7 @@ napi_value NAPIAshmem::CreateAshmem(napi_env env, napi_callback_info info)
napi_value NAPIAshmem::CreateAshmemFromExisting(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = {nullptr};
napi_value argv[ARGV_LENGTH_1] = {nullptr};
napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr);
NAPI_ASSERT(env, argc == 1, "requires 1 parameter");
napi_value global = nullptr;
......@@ -134,7 +137,7 @@ napi_value NAPIAshmem::Create(napi_env env, napi_callback_info info)
size_t argc = 2;
size_t argcExistingAshmem = 1;
size_t argcAshmem = 2;
napi_value argv[2] = { 0 };
napi_value argv[ARGV_LENGTH_2] = { 0 };
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
if (!(argc == argcExistingAshmem || argc == argcAshmem)) {
ZLOGE(LOG_LABEL, "requires 1 or 2 parameter");
......@@ -200,7 +203,7 @@ napi_value NAPIAshmem::GetAshmemConstructor(napi_env env, napi_value* argv)
napi_value NAPIAshmem::GetAshmemFromExisting(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = {nullptr};
napi_value argv[ARGV_LENGTH_1] = {nullptr};
napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr);
napi_value global = nullptr;
napi_status status = napi_get_global(env, &global);
......@@ -277,7 +280,7 @@ napi_value NAPIAshmem::MapAshmem(napi_env env, napi_callback_info info)
{
napi_value thisVar = nullptr;
size_t argc = 1;
napi_value argv[1] = {0};
napi_value argv[ARGV_LENGTH_1] = {0};
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT(env, argc == 1, "requires 1 parameter");
napi_valuetype valueType = napi_null;
......@@ -299,7 +302,7 @@ napi_value NAPIAshmem::MapTypedAshmem(napi_env env, napi_callback_info info)
{
napi_value thisVar = nullptr;
size_t argc = 1;
napi_value argv[1] = {0};
napi_value argv[ARGV_LENGTH_1] = {0};
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
if (argc != 1) {
ZLOGE(LOG_LABEL, "requires 1 parameter");
......@@ -391,7 +394,7 @@ napi_value NAPIAshmem::ReadFromAshmem(napi_env env, napi_callback_info info)
{
napi_value thisVar = nullptr;
size_t argc = 2;
napi_value argv[2] = {0};
napi_value argv[ARGV_LENGTH_2] = {0};
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT(env, argc == 2, "requires 2 parameter");
napi_valuetype valueType = napi_null;
......@@ -443,7 +446,7 @@ napi_value NAPIAshmem::ReadAshmem(napi_env env, napi_callback_info info)
napi_value thisVar = nullptr;
size_t argc = 2;
size_t argNum = 2;
napi_value argv[2] = {0};
napi_value argv[ARGV_LENGTH_2] = {0};
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
if (argc != argNum) {
ZLOGE(LOG_LABEL, "requires 2 parameter");
......@@ -517,7 +520,7 @@ napi_value NAPIAshmem::SetProtection(napi_env env, napi_callback_info info)
{
napi_value thisVar = nullptr;
size_t argc = 1;
napi_value argv[1] = { 0 };
napi_value argv[ARGV_LENGTH_1] = { 0 };
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT(env, argc == 1, "requires 1 parameter");
napi_valuetype valueType = napi_null;
......@@ -539,7 +542,7 @@ napi_value NAPIAshmem::SetProtectionType(napi_env env, napi_callback_info info)
napi_value thisVar = nullptr;
size_t argc = 1;
size_t argNum = 1;
napi_value argv[1] = { 0 };
napi_value argv[ARGV_LENGTH_1] = { 0 };
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
if (argc != argNum) {
ZLOGE(LOG_LABEL, "requires 1 parameter");
......@@ -581,7 +584,7 @@ napi_value NAPIAshmem::UnmapAshmem(napi_env env, napi_callback_info info)
napi_value NAPIAshmem::WriteToAshmem(napi_env env, napi_callback_info info)
{
size_t argc = 3;
napi_value argv[3] = {0};
napi_value argv[ARGV_LENGTH_3] = {0};
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT(env, argc == 3, "requires 1 parameter");
......@@ -638,7 +641,7 @@ napi_value NAPIAshmem::WriteToAshmem(napi_env env, napi_callback_info info)
napi_value NAPIAshmem::WriteAshmem(napi_env env, napi_callback_info info)
{
size_t argc = 3;
napi_value argv[3] = {0};
napi_value argv[ARGV_LENGTH_3] = {0};
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
napi_value checkArgsResult = CheckWriteAshmemParams(env, argc, argv);
......@@ -771,7 +774,7 @@ napi_value NAPIAshmem::Ashmem_JS_Constructor(napi_env env, napi_callback_info in
{
napi_value thisVar = nullptr;
size_t argc = 2;
napi_value argv[2] = { 0 };
napi_value argv[ARGV_LENGTH_2] = { 0 };
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPIAshmem *napiAshmem = nullptr;
if (argc == 0) {
......
ipc/native/src/napi_common/source/napi_message_parcel.cpp
浏览文件 @ c37eac00
......@@ -34,6 +34,8 @@ constexpr size_t BYTE_SIZE_64 = 8;
static const size_t ARGV_INDEX_0 = 0;
static const size_t ARGV_INDEX_1 = 1;
static const size_t ARGV_LENGTH_1 = 1;
static const size_t ARGV_LENGTH_2 = 2;
static constexpr OHOS::HiviewDFX::HiLogLabel LOG_LABEL = { LOG_CORE, LOG_ID_IPC, "napi_messageParcel" };
#define CHECK_WRITE_CAPACITY(env, lenToWrite, napiParcel) \
......@@ -98,7 +100,7 @@ std::shared_ptr<MessageParcel> NAPI_MessageParcel::GetMessageParcel()
napi_value NAPI_MessageParcel::JS_writeByte(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = {0};
napi_value argv[ARGV_LENGTH_1] = {0};
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT(env, argc == 1, "requires 1 parameter");
......@@ -123,7 +125,7 @@ napi_value NAPI_MessageParcel::JS_writeByte(napi_env env, napi_callback_info inf
napi_value NAPI_MessageParcel::JS_writeShort(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = {0};
napi_value argv[ARGV_LENGTH_1] = {0};
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT(env, argc == 1, "requires 1 parameter");
......@@ -148,7 +150,7 @@ napi_value NAPI_MessageParcel::JS_writeShort(napi_env env, napi_callback_info in
napi_value NAPI_MessageParcel::JS_writeInt(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = {0};
napi_value argv[ARGV_LENGTH_1] = {0};
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT(env, argc == 1, "requires 1 parameter");
......@@ -173,7 +175,7 @@ napi_value NAPI_MessageParcel::JS_writeInt(napi_env env, napi_callback_info info
napi_value NAPI_MessageParcel::JS_writeLong(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = {0};
napi_value argv[ARGV_LENGTH_1] = {0};
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT(env, argc == 1, "requires 1 parameter");
......@@ -198,7 +200,7 @@ napi_value NAPI_MessageParcel::JS_writeLong(napi_env env, napi_callback_info inf
napi_value NAPI_MessageParcel::JS_writeFloat(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = {0};
napi_value argv[ARGV_LENGTH_1] = {0};
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT(env, argc == 1, "requires 1 parameter");
......@@ -223,7 +225,7 @@ napi_value NAPI_MessageParcel::JS_writeFloat(napi_env env, napi_callback_info in
napi_value NAPI_MessageParcel::JS_writeDouble(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = {0};
napi_value argv[ARGV_LENGTH_1] = {0};
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT(env, argc == 1, "requires 1 parameter");
......@@ -248,7 +250,7 @@ napi_value NAPI_MessageParcel::JS_writeDouble(napi_env env, napi_callback_info i
napi_value NAPI_MessageParcel::JS_writeBoolean(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = {0};
napi_value argv[ARGV_LENGTH_1] = {0};
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT(env, argc == 1, "requires 1 parameter");
......@@ -273,7 +275,7 @@ napi_value NAPI_MessageParcel::JS_writeBoolean(napi_env env, napi_callback_info
napi_value NAPI_MessageParcel::JS_writeChar(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = {0};
napi_value argv[ARGV_LENGTH_1] = {0};
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT(env, argc == 1, "requires 1 parameter");
......@@ -298,7 +300,7 @@ napi_value NAPI_MessageParcel::JS_writeChar(napi_env env, napi_callback_info inf
napi_value NAPI_MessageParcel::JS_writeByteArray(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = {0};
napi_value argv[ARGV_LENGTH_1] = {0};
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT(env, argc == 1, "requires 1 parameter");
......@@ -345,7 +347,7 @@ napi_value NAPI_MessageParcel::JS_writeByteArray(napi_env env, napi_callback_inf
napi_value NAPI_MessageParcel::JS_writeShortArray(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = { 0 };
napi_value argv[ARGV_LENGTH_1] = { 0 };
napi_value thisVar = nullptr;
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......@@ -391,7 +393,7 @@ napi_value NAPI_MessageParcel::JS_writeShortArray(napi_env env, napi_callback_in
napi_value NAPI_MessageParcel::JS_writeIntArray(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = { 0 };
napi_value argv[ARGV_LENGTH_1] = { 0 };
napi_value thisVar = nullptr;
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......@@ -441,7 +443,7 @@ napi_value NAPI_MessageParcel::JS_writeIntArray(napi_env env, napi_callback_info
napi_value NAPI_MessageParcel::JS_writeLongArray(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = { 0 };
napi_value argv[ARGV_LENGTH_1] = { 0 };
napi_value thisVar = nullptr;
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......@@ -489,7 +491,7 @@ napi_value NAPI_MessageParcel::JS_writeLongArray(napi_env env, napi_callback_inf
napi_value NAPI_MessageParcel::JS_writeFloatArray(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = { 0 };
napi_value argv[ARGV_LENGTH_1] = { 0 };
napi_value thisVar = nullptr;
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......@@ -536,7 +538,7 @@ napi_value NAPI_MessageParcel::JS_writeFloatArray(napi_env env, napi_callback_in
napi_value NAPI_MessageParcel::JS_writeDoubleArray(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = { 0 };
napi_value argv[ARGV_LENGTH_1] = { 0 };
napi_value thisVar = nullptr;
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......@@ -583,7 +585,7 @@ napi_value NAPI_MessageParcel::JS_writeDoubleArray(napi_env env, napi_callback_i
napi_value NAPI_MessageParcel::JS_writeBooleanArray(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = { 0 };
napi_value argv[ARGV_LENGTH_1] = { 0 };
napi_value thisVar = nullptr;
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......@@ -630,7 +632,7 @@ napi_value NAPI_MessageParcel::JS_writeBooleanArray(napi_env env, napi_callback_
napi_value NAPI_MessageParcel::JS_writeCharArray(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = { 0 };
napi_value argv[ARGV_LENGTH_1] = { 0 };
napi_value thisVar = nullptr;
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......@@ -676,7 +678,7 @@ napi_value NAPI_MessageParcel::JS_writeCharArray(napi_env env, napi_callback_inf
napi_value NAPI_MessageParcel::JS_writeString(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = {0};
napi_value argv[ARGV_LENGTH_1] = {0};
napi_value thisVar = nullptr;
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......@@ -712,7 +714,7 @@ napi_value NAPI_MessageParcel::JS_writeString(napi_env env, napi_callback_info i
napi_value NAPI_MessageParcel::JS_writeStringArray(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = { 0 };
napi_value argv[ARGV_LENGTH_1] = { 0 };
napi_value thisVar = nullptr;
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......@@ -773,7 +775,7 @@ napi_value NAPI_MessageParcel::JS_writeSequenceable(napi_env env, napi_callback_
napi_get_boolean(env, false, &result);
size_t argc = 1;
napi_value argv[1] = { 0 };
napi_value argv[ARGV_LENGTH_1] = { 0 };
napi_value thisVar = nullptr;
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......@@ -815,7 +817,7 @@ napi_value NAPI_MessageParcel::JS_writeSequenceableArray(napi_env env, napi_call
napi_get_boolean(env, false, &retValue);
size_t argc = 1;
napi_value argv[1] = { 0 };
napi_value argv[ARGV_LENGTH_1] = { 0 };
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT_BASE(env, argc == 1, "requires 1 parameter", retValue);
......@@ -874,7 +876,7 @@ napi_value NAPI_MessageParcel::JS_writeRemoteObjectArray(napi_env env, napi_call
napi_get_boolean(env, false, &retValue);
size_t argc = 1;
napi_value argv[1] = { 0 };
napi_value argv[ARGV_LENGTH_1] = { 0 };
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT_BASE(env, argc == 1, "requires 1 parameter", retValue);
......@@ -1086,7 +1088,7 @@ napi_value NAPI_MessageParcel::JS_getCapacity(napi_env env, napi_callback_info i
napi_value NAPI_MessageParcel::JS_setSize(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = {0};
napi_value argv[ARGV_LENGTH_1] = {0};
napi_value thisVar = nullptr;
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......@@ -1112,7 +1114,7 @@ napi_value NAPI_MessageParcel::JS_setSize(napi_env env, napi_callback_info info)
napi_value NAPI_MessageParcel::JS_setCapacity(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = {0};
napi_value argv[ARGV_LENGTH_1] = {0};
napi_value thisVar = nullptr;
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......@@ -1189,7 +1191,7 @@ napi_value NAPI_MessageParcel::JS_getReadPosition(napi_env env, napi_callback_in
napi_value NAPI_MessageParcel::JS_rewindRead(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = {0};
napi_value argv[ARGV_LENGTH_1] = {0};
napi_value thisVar = nullptr;
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......@@ -1231,7 +1233,7 @@ napi_value NAPI_MessageParcel::JS_getWritePosition(napi_env env, napi_callback_i
napi_value NAPI_MessageParcel::JS_rewindWrite(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = {0};
napi_value argv[ARGV_LENGTH_1] = {0};
napi_value thisVar = nullptr;
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......@@ -1302,7 +1304,7 @@ napi_value NAPI_MessageParcel::JS_readByteArray(napi_env env, napi_callback_info
if (argc > 0) {
NAPI_ASSERT(env, argc == 1, "type mismatch for parameter 1");
napi_value argv[1] = {0};
napi_value argv[ARGV_LENGTH_1] = {0};
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......@@ -1353,7 +1355,7 @@ napi_value NAPI_MessageParcel::JS_readShortArray(napi_env env, napi_callback_inf
if (argc > 0) {
NAPI_ASSERT(env, argc == 1, "type mismatch for parameter 1");
CHECK_READ_LENGTH(env, (size_t)arrayLength, BYTE_SIZE_32, napiParcel);
napi_value argv[1] = {0};
napi_value argv[ARGV_LENGTH_1] = {0};
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......@@ -1404,7 +1406,7 @@ napi_value NAPI_MessageParcel::JS_readIntArray(napi_env env, napi_callback_info
if (argc > 0) {
NAPI_ASSERT(env, argc == 1, "type mismatch for parameter 1");
CHECK_READ_LENGTH(env, (size_t)arrayLength, BYTE_SIZE_32, napiParcel);
napi_value argv[1] = {0};
napi_value argv[ARGV_LENGTH_1] = {0};
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......@@ -1455,7 +1457,7 @@ napi_value NAPI_MessageParcel::JS_readLongArray(napi_env env, napi_callback_info
if (argc > 0) {
NAPI_ASSERT(env, argc == 1, "type mismatch for parameter 1");
CHECK_READ_LENGTH(env, (size_t)arrayLength, BYTE_SIZE_64, napiParcel);
napi_value argv[1] = {0};
napi_value argv[ARGV_LENGTH_1] = {0};
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......@@ -1506,7 +1508,7 @@ napi_value NAPI_MessageParcel::JS_readFloatArray(napi_env env, napi_callback_inf
if (argc > 0) {
NAPI_ASSERT(env, argc == 1, "type mismatch for parameter 1");
CHECK_READ_LENGTH(env, (size_t)arrayLength, sizeof(double), napiParcel);
napi_value argv[1] = {0};
napi_value argv[ARGV_LENGTH_1] = {0};
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......@@ -1557,7 +1559,7 @@ napi_value NAPI_MessageParcel::JS_readDoubleArray(napi_env env, napi_callback_in
if (argc > 0) {
NAPI_ASSERT(env, argc == 1, "type mismatch for parameter 1");
CHECK_READ_LENGTH(env, (size_t)arrayLength, sizeof(double), napiParcel);
napi_value argv[1] = {0};
napi_value argv[ARGV_LENGTH_1] = {0};
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......@@ -1608,7 +1610,7 @@ napi_value NAPI_MessageParcel::JS_readBooleanArray(napi_env env, napi_callback_i
if (argc > 0) {
NAPI_ASSERT(env, argc == 1, "type mismatch for parameter 1");
CHECK_READ_LENGTH(env, (size_t)arrayLength, BYTE_SIZE_32, napiParcel);
napi_value argv[1] = {0};
napi_value argv[ARGV_LENGTH_1] = {0};
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......@@ -1660,7 +1662,7 @@ napi_value NAPI_MessageParcel::JS_readCharArray(napi_env env, napi_callback_info
if (argc > 0) {
NAPI_ASSERT(env, argc == 1, "type mismatch for parameter 1");
CHECK_READ_LENGTH(env, (size_t)arrayLength, BYTE_SIZE_32, napiParcel);
napi_value argv[1] = {0};
napi_value argv[ARGV_LENGTH_1] = {0};
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......@@ -1711,7 +1713,7 @@ napi_value NAPI_MessageParcel::JS_readStringArray(napi_env env, napi_callback_in
if (argc > 0) {
NAPI_ASSERT(env, argc == 1, "type mismatch for parameter 1");
CHECK_READ_LENGTH(env, (size_t)arrayLength, BYTE_SIZE_32, napiParcel);
napi_value argv[1] = {0};
napi_value argv[ARGV_LENGTH_1] = {0};
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......@@ -1754,7 +1756,7 @@ napi_value NAPI_MessageParcel::JS_readSequenceableArray(napi_env env, napi_callb
{
size_t argc = 1;
napi_value thisVar = nullptr;
napi_value argv[1] = { 0 };
napi_value argv[ARGV_LENGTH_1] = { 0 };
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT(env, argc == 1, "requires 1 parameter");
......@@ -1813,7 +1815,7 @@ napi_value NAPI_MessageParcel::JS_readRemoteObjectArray(napi_env env, napi_callb
napi_get_undefined(env, &result);
size_t argc = 0;
napi_value argv[1] = { 0 };
napi_value argv[ARGV_LENGTH_1] = { 0 };
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
......@@ -1857,7 +1859,7 @@ napi_value NAPI_MessageParcel::JS_readRemoteObjectArray(napi_env env, napi_callb
napi_value NAPI_MessageParcel::JS_readSequenceable(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = {0};
napi_value argv[ARGV_LENGTH_1] = {0};
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT(env, argc == 1, "requires 1 parameter");
......@@ -1922,7 +1924,7 @@ napi_value NAPI_MessageParcel::JS_reclaim(napi_env env, napi_callback_info info)
napi_value NAPI_MessageParcel::JS_writeRemoteObject(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = { 0 };
napi_value argv[ARGV_LENGTH_1] = { 0 };
napi_value thisVar = nullptr;
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......@@ -1965,7 +1967,7 @@ napi_value NAPI_MessageParcel::JS_readRemoteObject(napi_env env, napi_callback_i
napi_value NAPI_MessageParcel::JS_writeInterfaceToken(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = { 0 };
napi_value argv[ARGV_LENGTH_1] = { 0 };
napi_value thisVar = nullptr;
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......@@ -2017,7 +2019,7 @@ napi_value NAPI_MessageParcel::JS_readInterfaceToken(napi_env env, napi_callback
napi_value NAPI_MessageParcel::JS_CloseFileDescriptor(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = { 0 };
napi_value argv[ARGV_LENGTH_1] = { 0 };
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT(env, argc == 1, "requires 1 parameters");
......@@ -2035,7 +2037,7 @@ napi_value NAPI_MessageParcel::JS_CloseFileDescriptor(napi_env env, napi_callbac
napi_value NAPI_MessageParcel::JS_DupFileDescriptor(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = { 0 };
napi_value argv[ARGV_LENGTH_1] = { 0 };
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT(env, argc == 1, "requires 1 parameters");
......@@ -2067,7 +2069,7 @@ napi_value NAPI_MessageParcel::JS_ContainFileDescriptors(napi_env env, napi_call
napi_value NAPI_MessageParcel::JS_WriteFileDescriptor(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = { 0 };
napi_value argv[ARGV_LENGTH_1] = { 0 };
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT(env, argc == 1, "requires 1 parameters");
......@@ -2102,7 +2104,7 @@ napi_value NAPI_MessageParcel::JS_ReadFileDescriptor(napi_env env, napi_callback
napi_value NAPI_MessageParcel::JS_WriteAshmem(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = { 0 };
napi_value argv[ARGV_LENGTH_1] = { 0 };
napi_value thisVar = nullptr;
void *data = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, &data);
......@@ -2159,7 +2161,7 @@ napi_value NAPI_MessageParcel::JS_ReadAshmem(napi_env env, napi_callback_info in
napi_value NAPI_MessageParcel::JS_WriteRawData(napi_env env, napi_callback_info info)
{
size_t argc = 2;
napi_value argv[2] = {0};
napi_value argv[ARGV_LENGTH_2] = {0};
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT(env, argc == 2, "requires 2 parameter");
......@@ -2201,7 +2203,7 @@ napi_value NAPI_MessageParcel::JS_WriteRawData(napi_env env, napi_callback_info
napi_value NAPI_MessageParcel::JS_ReadRawData(napi_env env, napi_callback_info info)
{
size_t argc = 1;
napi_value argv[1] = { 0 };
napi_value argv[ARGV_LENGTH_1] = { 0 };
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT(env, argc == 1, "requires 1 parameters");
......@@ -2338,7 +2340,7 @@ napi_value NAPI_MessageParcel::JS_constructor(napi_env env, napi_callback_info i
{
napi_value thisVar = nullptr;
size_t argc = 1;
napi_value argv[1] = { 0 };
napi_value argv[ARGV_LENGTH_1] = { 0 };
napi_status status = napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT(env, status == napi_ok, "napi get callback info failed");
MessageParcel *parcel = nullptr;
......
ipc/native/src/napi_common/source/napi_remote_object.cpp
浏览文件 @ c37eac00
......@@ -40,6 +40,12 @@ static const size_t ARGV_INDEX_1 = 1;
static const size_t ARGV_INDEX_2 = 2;
static const size_t ARGV_INDEX_3 = 3;
static const size_t ARGV_INDEX_4 = 4;
static const size_t ARGV_LENGTH_1 = 1;
static const size_t ARGV_LENGTH_2 = 2;
// static const size_t ARGV_LENGTH_3 = 3;
// static const size_t ARGV_LENGTH_4 = 4;
static const size_t ARGV_LENGTH_5 = 5;
static const uint64_t HITRACE_TAG_RPC = (1ULL << 46); // RPC and IPC tag.
static std::atomic<int32_t> bytraceId = 1000;
......@@ -167,7 +173,7 @@ static NativeValue *RemoteObjectAttachCb(NativeEngine *engine, void *value, void
napi_create_string_utf8(env, desc.c_str(), desc.length(), &jsDesc);
// create a new js remote object
size_t argc = 1;
napi_value argv[1] = { jsDesc };
napi_value argv[ARGV_LENGTH_1] = { jsDesc };
napi_value jsRemoteObject = nullptr;
status = napi_new_instance(env, constructor, argc, argv, &jsRemoteObject);
NAPI_ASSERT(env, status == napi_ok, "failed to construct js RemoteObject when attach");
......@@ -187,7 +193,7 @@ napi_value RemoteObject_JS_Constructor(napi_env env, napi_callback_info info)
// new napi remote object
size_t argc = 2;
size_t expectedArgc = 1;
napi_value argv[2] = { 0 };
napi_value argv[ARGV_LENGTH_2] = { 0 };
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT(env, argc >= expectedArgc, "requires at least 1 parameters");
......@@ -352,7 +358,7 @@ napi_value NAPIRemoteObject::ThenCallback(napi_env env, napi_callback_info info)
{
ZLOGI(LOG_LABEL, "call js onRemoteRequest done");
size_t argc = 1;
napi_value argv[1] = {nullptr};
napi_value argv[ARGV_LENGTH_1] = {nullptr};
void* data = nullptr;
napi_get_cb_info(env, info, &argc, argv, nullptr, &data);
CallbackParam *param = static_cast<CallbackParam *>(data);
......@@ -376,7 +382,7 @@ napi_value NAPIRemoteObject::CatchCallback(napi_env env, napi_callback_info info
{
ZLOGI(LOG_LABEL, "Async onReomteReuqest's returnVal is rejected");
size_t argc = 1;
napi_value argv[1] = {nullptr};
napi_value argv[ARGV_LENGTH_1] = {nullptr};
void* data = nullptr;
napi_get_cb_info(env, info, &argc, argv, nullptr, &data);
CallbackParam *param = static_cast<CallbackParam *>(data);
......@@ -534,7 +540,7 @@ int NAPIRemoteObject::OnJsRemoteRequest(CallbackParam *jsParam)
napi_create_int32(param->env, param->option->GetFlags(), &flags);
napi_value waittime = nullptr;
napi_create_int32(param->env, param->option->GetWaitTime(), &waittime);
napi_value argv[2] = { flags, waittime };
napi_value argv[ARGV_LENGTH_2] = { flags, waittime };
napi_new_instance(param->env, jsOptionConstructor, argc, argv, &jsOption);
if (jsOption == nullptr) {
ZLOGE(LOG_LABEL, "new jsOption failed");
......@@ -726,7 +732,7 @@ napi_value NAPI_ohos_rpc_CreateJsRemoteObject(napi_env env, const sptr<IRemoteOb
napi_create_string_utf8(env, desc.c_str(), desc.length(), &jsDesc);
// create a new js remote object
size_t argc = 1;
napi_value argv[1] = { jsDesc };
napi_value argv[ARGV_LENGTH_1] = { jsDesc };
napi_value jsRemoteObject = nullptr;
status = napi_new_instance(env, constructor, argc, argv, &jsRemoteObject);
NAPI_ASSERT(env, status == napi_ok, "failed to construct js RemoteObject");
......@@ -792,7 +798,7 @@ static napi_value NAPI_RemoteObject_queryLocalInterface(napi_env env, napi_callb
{
size_t argc = 1;
size_t expectedArgc = 1;
napi_value argv[1] = { 0 };
napi_value argv[ARGV_LENGTH_1] = { 0 };
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT(env, argc == expectedArgc, "requires 1 parameters");
......@@ -819,7 +825,7 @@ static napi_value NAPI_RemoteObject_getLocalInterface(napi_env env, napi_callbac
{
size_t argc = 1;
size_t expectedArgc = 1;
napi_value argv[1] = { 0 };
napi_value argv[ARGV_LENGTH_1] = { 0 };
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
if (argc != expectedArgc) {
......@@ -1056,7 +1062,7 @@ static napi_value NAPI_RemoteObject_sendRequest(napi_env env, napi_callback_info
size_t argc = 4;
size_t argcCallback = 5;
size_t argcPromise = 4;
napi_value argv[5] = { 0 };
napi_value argv[ARGV_LENGTH_5] = { 0 };
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT(env, argc == argcPromise || argc == argcCallback, "requires 4 or 5 parameters");
......@@ -1137,7 +1143,7 @@ static napi_value NAPI_RemoteObject_sendMessageRequest(napi_env env, napi_callba
size_t argc = 4;
size_t argcCallback = 5;
size_t argcPromise = 4;
napi_value argv[5] = { 0 };
napi_value argv[ARGV_LENGTH_5] = { 0 };
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
napi_value checkArgsResult = NAPI_RemoteObject_checkSendMessageRequestArgs(env, argc, argcCallback, argcPromise,
......@@ -1184,7 +1190,7 @@ static napi_value NAPI_RemoteObject_attachLocalInterface(napi_env env, napi_call
{
size_t argc = 2;
size_t expectedArgc = 2;
napi_value argv[2] = { 0 };
napi_value argv[ARGV_LENGTH_2] = { 0 };
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
NAPI_ASSERT(env, argc == expectedArgc, "requires 2 parameters");
......@@ -1240,7 +1246,7 @@ napi_value NAPI_RemoteObject_checkModifyLocalInterfaceArgs(napi_env env, size_t
static napi_value NAPI_RemoteObject_modifyLocalInterface(napi_env env, napi_callback_info info)
{
size_t argc = 2;
napi_value argv[2] = { 0 };
napi_value argv[ARGV_LENGTH_2] = { 0 };
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
napi_value checkArgsResult = NAPI_RemoteObject_checkModifyLocalInterfaceArgs(env, argc, argv);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或