Skip to content

Commit 5354ed7

Browse files
committed
Change napi_create_function to take the name parameter as const char* instead of napi_propertyname
1 parent 0b861ef commit 5354ed7

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

src/node_jsvmapi.cc

+6-5
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ napi_status napi_create_function(
646646
napi_env e,
647647
napi_callback cb,
648648
void* data,
649-
napi_propertyname name,
649+
const char* utf8name,
650650
napi_value* result) {
651651
NAPI_PREAMBLE(e);
652652
CHECK_ARG(result);
@@ -666,10 +666,11 @@ napi_status napi_create_function(
666666
isolate, v8impl::FunctionCallbackWrapper::Invoke, cbdata);
667667

668668
retval = scope.Escape(tpl->GetFunction());
669-
670-
if (name) {
671-
v8::Local<v8::String> n = v8impl::V8LocalStringFromJsPropertyName(name);
672-
retval->SetName(n);
669+
670+
if (utf8name) {
671+
v8::Local<v8::String> namestring;
672+
CHECK_NEW_FROM_UTF8(isolate, namestring, utf8name);
673+
retval->SetName(namestring);
673674
}
674675

675676
*result = v8impl::JsValueFromV8LocalValue(retval);

src/node_jsvmapi.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ NODE_EXTERN napi_status napi_create_symbol(napi_env e,
110110
NODE_EXTERN napi_status napi_create_function(napi_env e,
111111
napi_callback cb,
112112
void* data,
113-
napi_propertyname name,
113+
const char* utf8name,
114114
napi_value* result);
115115
NODE_EXTERN napi_status napi_create_error(napi_env e,
116116
napi_value msg,

test/addons-abi/5_function_factory/binding.cc

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <node_jsvmapi.h>
1+
#include <node_jsvmapi.h>
22

33
void MyFunction(napi_env env, napi_callback_info info) {
44
napi_status status;
@@ -14,12 +14,8 @@ void MyFunction(napi_env env, napi_callback_info info) {
1414
void CreateFunction(napi_env env, napi_callback_info info) {
1515
napi_status status;
1616

17-
napi_propertyname name;
18-
status = napi_property_name(env, "theFunction", &name);
19-
if (status != napi_ok) return;
20-
2117
napi_value fn;
22-
status = napi_create_function(env, MyFunction, nullptr, name, &fn);
18+
status = napi_create_function(env, MyFunction, nullptr, "theFunction", &fn);
2319
if (status != napi_ok) return;
2420

2521
status = napi_set_return_value(env, info, fn);

0 commit comments

Comments
 (0)