Skip to content

Commit 246b589

Browse files
author
Ian Halliday
committed
Change napi_throw_error to napi_throw
And change napi_env parameter names to env from napi_env.
1 parent ec3d311 commit 246b589

File tree

6 files changed

+57
-57
lines changed

6 files changed

+57
-57
lines changed

‎1_hello_world/abi/hello.cc‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
#include <node_jsvmapi.h>
22

3-
void Method(napi_env napi_env, napi_func_cb_info info) {
3+
void Method(napi_env env, napi_func_cb_info info) {
44
napi_set_return_value(
5-
napi_env,
5+
env,
66
info,
7-
napi_create_string(napi_env, "world"));
7+
napi_create_string(env, "world"));
88
}
99

10-
void Init(napi_env napi_env, napi_value exports, napi_value module) {
11-
napi_set_property(napi_env, exports,
12-
napi_property_name(napi_env, "hello"),
13-
napi_create_function(napi_env, Method));
10+
void Init(napi_env env, napi_value exports, napi_value module) {
11+
napi_set_property(env, exports,
12+
napi_property_name(env, "hello"),
13+
napi_create_function(env, Method));
1414
}
1515

1616
NODE_MODULE_ABI(addon, Init)

‎2_function_arguments/abi/addon.cc‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
#include <node_jsvmapi.h>
22

3-
void Add(napi_env napi_env, napi_func_cb_info info) {
4-
if (napi_get_cb_args_length(napi_env, info) < 2) {
5-
napi_throw_error(
6-
napi_env,
3+
void Add(napi_env env, napi_func_cb_info info) {
4+
if (napi_get_cb_args_length(env, info) < 2) {
5+
napi_throw(
6+
env,
77
napi_create_type_error(
8-
napi_env,
9-
napi_create_string(napi_env, "Wrong number of arguments")));
8+
env,
9+
napi_create_string(env, "Wrong number of arguments")));
1010
return;
1111
}
1212

1313
napi_value args[2];
14-
napi_get_cb_args(napi_env, info, args, 2);
14+
napi_get_cb_args(env, info, args, 2);
1515

16-
if (napi_get_type_of_value(napi_env, args[0]) != napi_number ||
17-
napi_get_type_of_value(napi_env, args[1]) != napi_number) {
18-
napi_throw_error(
19-
napi_env,
16+
if (napi_get_type_of_value(env, args[0]) != napi_number ||
17+
napi_get_type_of_value(env, args[1]) != napi_number) {
18+
napi_throw(
19+
env,
2020
napi_create_type_error(
21-
napi_env,
22-
napi_create_string(napi_env, "Wrong arguments")));
21+
env,
22+
napi_create_string(env, "Wrong arguments")));
2323
return;
2424
}
2525

26-
double value = napi_get_number_from_value(napi_env, args[0])
27-
+ napi_get_number_from_value(napi_env, args[1]);
28-
napi_value num = napi_create_number(napi_env, value);
26+
double value = napi_get_number_from_value(env, args[0])
27+
+ napi_get_number_from_value(env, args[1]);
28+
napi_value num = napi_create_number(env, value);
2929

30-
napi_set_return_value(napi_env, info, num);
30+
napi_set_return_value(env, info, num);
3131
}
3232

3333

34-
void Init(napi_env napi_env, napi_value exports, napi_value module) {
35-
napi_set_property(napi_env, exports,
36-
napi_property_name(napi_env, "add"),
37-
napi_create_function(napi_env, Add));
34+
void Init(napi_env env, napi_value exports, napi_value module) {
35+
napi_set_property(env, exports,
36+
napi_property_name(env, "add"),
37+
napi_create_function(env, Add));
3838
}
3939

4040
NODE_MODULE_ABI(addon, Init)

‎3_callbacks/abi/addon.cc‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
#include <node_jsvmapi.h>
22

3-
void RunCallback(napi_env napi_env, const napi_func_cb_info info) {
3+
void RunCallback(napi_env env, const napi_func_cb_info info) {
44
napi_value args[1];
5-
napi_get_cb_args(napi_env, info, args, 1);
5+
napi_get_cb_args(env, info, args, 1);
66
napi_value cb = args[0];
77

88
napi_value argv[1];
9-
argv[0] = napi_create_string(napi_env, "hello world");
10-
napi_call_function(napi_env, napi_get_global_scope(napi_env) , cb, 1, argv);
9+
argv[0] = napi_create_string(env, "hello world");
10+
napi_call_function(env, napi_get_global_scope(env) , cb, 1, argv);
1111
}
1212

13-
void Init(napi_env napi_env, napi_value exports, napi_value module) {
14-
napi_set_property(napi_env, module,
15-
napi_property_name(napi_env, "exports"),
16-
napi_create_function(napi_env, RunCallback));
13+
void Init(napi_env env, napi_value exports, napi_value module) {
14+
napi_set_property(env, module,
15+
napi_property_name(env, "exports"),
16+
napi_create_function(env, RunCallback));
1717
}
1818

1919
NODE_MODULE_ABI(addon, Init)

‎4_object_factory/abi/addon.cc‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
#include <node_jsvmapi.h>
22

3-
void napi_create_object(napi_env napi_env, const napi_func_cb_info info) {
3+
void napi_create_object(napi_env env, const napi_func_cb_info info) {
44
napi_value args[1];
5-
napi_get_cb_args(napi_env, info, args, 1);
5+
napi_get_cb_args(env, info, args, 1);
66

7-
napi_value obj = napi_create_object(napi_env);
8-
napi_set_property(napi_env, obj, napi_property_name(napi_env, "msg"),
7+
napi_value obj = napi_create_object(env);
8+
napi_set_property(env, obj, napi_property_name(env, "msg"),
99
args[0]);
1010

11-
napi_set_return_value(napi_env, info, obj);
11+
napi_set_return_value(env, info, obj);
1212
}
1313

14-
void Init(napi_env napi_env, napi_value exports, napi_value module) {
15-
napi_set_property(napi_env, module,
16-
napi_property_name(napi_env, "exports"),
17-
napi_create_function(napi_env, napi_create_object));
14+
void Init(napi_env env, napi_value exports, napi_value module) {
15+
napi_set_property(env, module,
16+
napi_property_name(env, "exports"),
17+
napi_create_function(env, napi_create_object));
1818
}
1919

2020
NODE_MODULE_ABI(addon, Init)

‎5_function_factory/abi/addon.cc‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
#include <node_jsvmapi.h>
22

3-
void MyFunction(napi_env napi_env, napi_func_cb_info info) {
4-
napi_set_return_value(napi_env, info, napi_create_string(napi_env, "hello world"));
3+
void MyFunction(napi_env env, napi_func_cb_info info) {
4+
napi_set_return_value(env, info, napi_create_string(env, "hello world"));
55
}
66

7-
void napi_create_function(napi_env napi_env, napi_func_cb_info info) {
8-
napi_value fn = napi_create_function(napi_env, MyFunction);
7+
void napi_create_function(napi_env env, napi_func_cb_info info) {
8+
napi_value fn = napi_create_function(env, MyFunction);
99

1010
// omit this to make it anonymous
11-
napi_set_function_name(napi_env, fn, napi_property_name(napi_env, "theFunction"));
11+
napi_set_function_name(env, fn, napi_property_name(env, "theFunction"));
1212

13-
napi_set_return_value(napi_env, info, fn);
13+
napi_set_return_value(env, info, fn);
1414
}
1515

16-
void Init(napi_env napi_env, napi_value exports, napi_value module) {
17-
napi_set_property(napi_env, module,
18-
napi_property_name(napi_env, "exports"),
19-
napi_create_function(napi_env, napi_create_function));
16+
void Init(napi_env env, napi_value exports, napi_value module) {
17+
napi_set_property(env, module,
18+
napi_property_name(env, "exports"),
19+
napi_create_function(env, napi_create_function));
2020
}
2121

2222
NODE_MODULE_ABI(addon, Init)

‎6_object_wrap/abi/addon.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "myobject.h"
22

3-
void Init(napi_env napi_env, napi_value exports, napi_value module) {
4-
MyObject::Init(napi_env, exports);
3+
void Init(napi_env env, napi_value exports, napi_value module) {
4+
MyObject::Init(env, exports);
55
}
66

77
NODE_MODULE_ABI(addon, Init)

0 commit comments

Comments
 (0)