Skip to content

n-api: add optional string length parameter #15343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sampsongao wants to merge 10 commits into from
Closed

n-api: add optional string length parameter #15343

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
07e9df4
n-api: add optional string length parameters
Sep 11, 2017
53c4e81
napi: update doc for additional string length parameter
Sep 11, 2017
7a7dc8b
n-api: fix build errors
Sep 11, 2017
ef1af4a
test: update test for additional string length parameter
Sep 11, 2017
8762a3c
Handle non-zero terminated string in napi_fatal_error
Sep 15, 2017
c0b202c
Add tests for non-zero termianted string input
Sep 15, 2017
cf0f4fa
Fix errors after rebasing
Sep 15, 2017
90ef051
Fix CI run fail
Sep 15, 2017
b0175ae
Fix remaining rebasing difference
Sep 15, 2017
8e7bf47
Fix linter error
Sep 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test: update test for additional string length parameter
  • Loading branch information
Sampson Gao committed Sep 15, 2017
commit ef1af4add53c4e291271a840ac06558b9969bf0a
4 changes: 1 addition & 3 deletions test/addons-napi/5_function_factory/binding.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@
napi_value MyFunction(napi_env env, napi_callback_info info) {
napi_value str;
NAPI_CALL(env, napi_create_string_utf8(env, "hello world", -1, &str));

return str;
}

napi_value CreateFunction(napi_env env, napi_callback_info info) {
napi_value fn;
NAPI_CALL(env,
napi_create_function(env, "theFunction", MyFunction, NULL, &fn));

napi_create_function(env, "theFunction", -1, MyFunction, NULL, &fn));
return fn;
}

Expand Down
1 change: 1 addition & 0 deletions test/addons-napi/6_object_wrap/myobject.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ void MyObject::Init(napi_env env, napi_value exports) {
napi_value cons;
NAPI_CALL_RETURN_VOID(env,
napi_define_class(env, "MyObject", New, nullptr, 3, properties, &cons));
napi_define_class(env, "MyObject", -1, New, nullptr, 3, properties, &cons));

NAPI_CALL_RETURN_VOID(env, napi_create_reference(env, cons, 1, &constructor));

Expand Down
2 changes: 1 addition & 1 deletion test/addons-napi/7_factory_wrap/myobject.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ napi_status MyObject::Init(napi_env env) {

napi_value cons;
status =
napi_define_class(env, "MyObject", New, nullptr, 1, properties, &cons);
napi_define_class(env, "MyObject", -1, New, nullptr, 1, properties, &cons);
if (status != napi_ok) return status;

status = napi_create_reference(env, cons, 1, &constructor);
Expand Down
2 changes: 1 addition & 1 deletion test/addons-napi/8_passing_wrapped/myobject.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ napi_status MyObject::Init(napi_env env) {
napi_status status;

napi_value cons;
status = napi_define_class(env, "MyObject", New, nullptr, 0, nullptr, &cons);
status = napi_define_class(env, "MyObject", -1, New, nullptr, 0, nullptr, &cons);
if (status != napi_ok) return status;

status = napi_create_reference(env, cons, 1, &constructor);
Expand Down
4 changes: 2 additions & 2 deletions test/addons-napi/test_constructor/test_constructor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ napi_value Init(napi_env env, napi_value exports) {
};

napi_value cons;
NAPI_CALL(env, napi_define_class(env, "MyObject", New,
NULL, sizeof(properties)/sizeof(*properties), properties, &cons));
NAPI_CALL_RETURN_VOID(env, napi_define_class(env, "MyObject", -1, New,
NULL, sizeof(properties)/sizeof(*properties), properties, &cons));

NAPI_CALL(env, napi_create_reference(env, cons, 1, &constructor_));

Expand Down
2 changes: 1 addition & 1 deletion test/addons-napi/test_fatal/test_fatal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "../common.h"

napi_value Test(napi_env env, napi_callback_info info) {
napi_fatal_error("test_fatal::Test", "fatal message");
napi_fatal_error("test_fatal::Test", -1, "fatal message", -1);
return NULL;
}

Expand Down
4 changes: 2 additions & 2 deletions test/addons-napi/test_function/test_function.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ napi_value Test(napi_env env, napi_callback_info info) {

napi_value Init(napi_env env, napi_value exports) {
napi_value fn;
NAPI_CALL(env, napi_create_function(env, NULL, Test, NULL, &fn));
NAPI_CALL(env, napi_create_function(env, NULL, -1, Test, NULL, &fn));
NAPI_CALL(env, napi_set_named_property(env, exports, "Test", fn));
return exports;
>>>>>>> test: update test for additional string length parameter
}

NAPI_MODULE(NODE_GYP_MODULE_NAME, Init)
2 changes: 1 addition & 1 deletion test/addons-napi/test_make_callback/binding.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ napi_value MakeCallback(napi_env env, napi_callback_info info) {

napi_value Init(napi_env env, napi_value exports) {
napi_value fn;
NAPI_CALL(env, napi_create_function(env, NULL, MakeCallback, NULL, &fn));
NAPI_CALL(env, napi_create_function(env, NULL, -1, MakeCallback, NULL, &fn));
NAPI_CALL(env, napi_set_named_property(env, exports, "makeCallback", fn));
return exports;
}
Expand Down
2 changes: 1 addition & 1 deletion test/addons-napi/test_make_callback_recurse/binding.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ napi_value MakeCallback(napi_env env, napi_callback_info info) {

napi_value Init(napi_env env, napi_value exports) {
napi_value fn;
NAPI_CALL(env, napi_create_function(env, NULL, MakeCallback, NULL, &fn));
NAPI_CALL(env, napi_create_function(env, NULL, -1, MakeCallback, NULL, &fn));
NAPI_CALL(env, napi_set_named_property(env, exports, "makeCallback", fn));
return exports;
}
Expand Down