Skip to content

Commit b239591

Browse files
Gabriel SchulhofMylesBorins
Gabriel Schulhof
authored and
MylesBorins
committed
n-api,test: make methods static
PR-URL: #20243 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Trivikram Kamat <[email protected]>
1 parent d4b19cf commit b239591

File tree

28 files changed

+139
-137
lines changed

28 files changed

+139
-137
lines changed

‎test/addons-napi/1_hello_world/binding.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "../common.h"
33
#include <string.h>
44

5-
napi_value Method(napi_env env, napi_callback_info info) {
5+
static napi_value Method(napi_env env, napi_callback_info info) {
66
napi_value world;
77
const char* str = "world";
88
size_t str_len = strlen(str);

‎test/addons-napi/2_function_arguments/binding.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <node_api.h>
22
#include "../common.h"
33

4-
napi_value Add(napi_env env, napi_callback_info info) {
4+
static napi_value Add(napi_env env, napi_callback_info info) {
55
size_t argc = 2;
66
napi_value args[2];
77
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -29,7 +29,7 @@ napi_value Add(napi_env env, napi_callback_info info) {
2929
return sum;
3030
}
3131

32-
napi_value Init(napi_env env, napi_value exports) {
32+
static napi_value Init(napi_env env, napi_value exports) {
3333
napi_property_descriptor desc = DECLARE_NAPI_PROPERTY("add", Add);
3434
NAPI_CALL(env, napi_define_properties(env, exports, 1, &desc));
3535
return exports;

‎test/addons-napi/3_callbacks/binding.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "../common.h"
33
#include <string.h>
44

5-
napi_value RunCallback(napi_env env, napi_callback_info info) {
5+
static napi_value RunCallback(napi_env env, napi_callback_info info) {
66
size_t argc = 2;
77
napi_value args[2];
88
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -34,7 +34,7 @@ napi_value RunCallback(napi_env env, napi_callback_info info) {
3434
return NULL;
3535
}
3636

37-
napi_value RunCallbackWithRecv(napi_env env, napi_callback_info info) {
37+
static napi_value RunCallbackWithRecv(napi_env env, napi_callback_info info) {
3838
size_t argc = 2;
3939
napi_value args[2];
4040
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -45,7 +45,7 @@ napi_value RunCallbackWithRecv(napi_env env, napi_callback_info info) {
4545
return NULL;
4646
}
4747

48-
napi_value Init(napi_env env, napi_value exports) {
48+
static napi_value Init(napi_env env, napi_value exports) {
4949
napi_property_descriptor desc[2] = {
5050
DECLARE_NAPI_PROPERTY("RunCallback", RunCallback),
5151
DECLARE_NAPI_PROPERTY("RunCallbackWithRecv", RunCallbackWithRecv),

‎test/addons-napi/4_object_factory/binding.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <node_api.h>
22
#include "../common.h"
33

4-
napi_value CreateObject(napi_env env, napi_callback_info info) {
4+
static napi_value CreateObject(napi_env env, napi_callback_info info) {
55
size_t argc = 1;
66
napi_value args[1];
77
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -14,7 +14,7 @@ napi_value CreateObject(napi_env env, napi_callback_info info) {
1414
return obj;
1515
}
1616

17-
napi_value Init(napi_env env, napi_value exports) {
17+
static napi_value Init(napi_env env, napi_value exports) {
1818
NAPI_CALL(env,
1919
napi_create_function(env, "exports", -1, CreateObject, NULL, &exports));
2020
return exports;

‎test/addons-napi/5_function_factory/binding.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
#include <node_api.h>
22
#include "../common.h"
33

4-
napi_value MyFunction(napi_env env, napi_callback_info info) {
4+
static napi_value MyFunction(napi_env env, napi_callback_info info) {
55
napi_value str;
66
NAPI_CALL(env, napi_create_string_utf8(env, "hello world", -1, &str));
77
return str;
88
}
99

10-
napi_value CreateFunction(napi_env env, napi_callback_info info) {
10+
static napi_value CreateFunction(napi_env env, napi_callback_info info) {
1111
napi_value fn;
1212
NAPI_CALL(env,
1313
napi_create_function(env, "theFunction", -1, MyFunction, NULL, &fn));
1414
return fn;
1515
}
1616

17-
napi_value Init(napi_env env, napi_value exports) {
17+
static napi_value Init(napi_env env, napi_value exports) {
1818
NAPI_CALL(env,
1919
napi_create_function(env, "exports", -1, CreateFunction, NULL, &exports));
2020
return exports;

‎test/addons-napi/test_array/test_array.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include <string.h>
33
#include "../common.h"
44

5-
napi_value TestGetElement(napi_env env, napi_callback_info info) {
5+
static napi_value TestGetElement(napi_env env, napi_callback_info info) {
66
size_t argc = 2;
77
napi_value args[2];
88
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -45,7 +45,7 @@ napi_value TestGetElement(napi_env env, napi_callback_info info) {
4545
return ret;
4646
}
4747

48-
napi_value TestHasElement(napi_env env, napi_callback_info info) {
48+
static napi_value TestHasElement(napi_env env, napi_callback_info info) {
4949
size_t argc = 2;
5050
napi_value args[2];
5151
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -84,7 +84,7 @@ napi_value TestHasElement(napi_env env, napi_callback_info info) {
8484
return ret;
8585
}
8686

87-
napi_value TestDeleteElement(napi_env env, napi_callback_info info) {
87+
static napi_value TestDeleteElement(napi_env env, napi_callback_info info) {
8888
size_t argc = 2;
8989
napi_value args[2];
9090

@@ -119,7 +119,7 @@ napi_value TestDeleteElement(napi_env env, napi_callback_info info) {
119119
return ret;
120120
}
121121

122-
napi_value New(napi_env env, napi_callback_info info) {
122+
static napi_value New(napi_env env, napi_callback_info info) {
123123
size_t argc = 1;
124124
napi_value args[1];
125125
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -147,7 +147,7 @@ napi_value New(napi_env env, napi_callback_info info) {
147147
return ret;
148148
}
149149

150-
napi_value NewWithLength(napi_env env, napi_callback_info info) {
150+
static napi_value NewWithLength(napi_env env, napi_callback_info info) {
151151
size_t argc = 1;
152152
napi_value args[1];
153153
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -169,7 +169,7 @@ napi_value NewWithLength(napi_env env, napi_callback_info info) {
169169
return ret;
170170
}
171171

172-
napi_value Init(napi_env env, napi_value exports) {
172+
static napi_value Init(napi_env env, napi_value exports) {
173173
napi_property_descriptor descriptors[] = {
174174
DECLARE_NAPI_PROPERTY("TestGetElement", TestGetElement),
175175
DECLARE_NAPI_PROPERTY("TestHasElement", TestHasElement),

‎test/addons-napi/test_buffer/test_buffer.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ static void noopDeleter(napi_env env, void* data, void* finalize_hint) {
2020
deleterCallCount++;
2121
}
2222

23-
napi_value newBuffer(napi_env env, napi_callback_info info) {
23+
static napi_value newBuffer(napi_env env, napi_callback_info info) {
2424
napi_value theBuffer;
2525
char* theCopy;
2626
const unsigned int kBufferSize = sizeof(theText);
@@ -37,7 +37,7 @@ napi_value newBuffer(napi_env env, napi_callback_info info) {
3737
return theBuffer;
3838
}
3939

40-
napi_value newExternalBuffer(napi_env env, napi_callback_info info) {
40+
static napi_value newExternalBuffer(napi_env env, napi_callback_info info) {
4141
napi_value theBuffer;
4242
char* theCopy = strdup(theText);
4343
NAPI_ASSERT(env, theCopy, "Failed to copy static text for newExternalBuffer");
@@ -53,20 +53,20 @@ napi_value newExternalBuffer(napi_env env, napi_callback_info info) {
5353
return theBuffer;
5454
}
5555

56-
napi_value getDeleterCallCount(napi_env env, napi_callback_info info) {
56+
static napi_value getDeleterCallCount(napi_env env, napi_callback_info info) {
5757
napi_value callCount;
5858
NAPI_CALL(env, napi_create_int32(env, deleterCallCount, &callCount));
5959
return callCount;
6060
}
6161

62-
napi_value copyBuffer(napi_env env, napi_callback_info info) {
62+
static napi_value copyBuffer(napi_env env, napi_callback_info info) {
6363
napi_value theBuffer;
6464
NAPI_CALL(env, napi_create_buffer_copy(
6565
env, sizeof(theText), theText, NULL, &theBuffer));
6666
return theBuffer;
6767
}
6868

69-
napi_value bufferHasInstance(napi_env env, napi_callback_info info) {
69+
static napi_value bufferHasInstance(napi_env env, napi_callback_info info) {
7070
size_t argc = 1;
7171
napi_value args[1];
7272
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -85,7 +85,7 @@ napi_value bufferHasInstance(napi_env env, napi_callback_info info) {
8585
return returnValue;
8686
}
8787

88-
napi_value bufferInfo(napi_env env, napi_callback_info info) {
88+
static napi_value bufferInfo(napi_env env, napi_callback_info info) {
8989
size_t argc = 1;
9090
napi_value args[1];
9191
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -106,7 +106,7 @@ napi_value bufferInfo(napi_env env, napi_callback_info info) {
106106
return returnValue;
107107
}
108108

109-
napi_value staticBuffer(napi_env env, napi_callback_info info) {
109+
static napi_value staticBuffer(napi_env env, napi_callback_info info) {
110110
napi_value theBuffer;
111111
NAPI_CALL(
112112
env,
@@ -119,7 +119,7 @@ napi_value staticBuffer(napi_env env, napi_callback_info info) {
119119
return theBuffer;
120120
}
121121

122-
napi_value Init(napi_env env, napi_value exports) {
122+
static napi_value Init(napi_env env, napi_value exports) {
123123
napi_value theValue;
124124

125125
NAPI_CALL(env,

‎test/addons-napi/test_constructor/test_constructor.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
static double value_ = 1;
55
static double static_value_ = 10;
66

7-
napi_value GetValue(napi_env env, napi_callback_info info) {
7+
static napi_value GetValue(napi_env env, napi_callback_info info) {
88
size_t argc = 0;
99
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, NULL, NULL, NULL));
1010

@@ -16,7 +16,7 @@ napi_value GetValue(napi_env env, napi_callback_info info) {
1616
return number;
1717
}
1818

19-
napi_value SetValue(napi_env env, napi_callback_info info) {
19+
static napi_value SetValue(napi_env env, napi_callback_info info) {
2020
size_t argc = 1;
2121
napi_value args[1];
2222
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -28,7 +28,7 @@ napi_value SetValue(napi_env env, napi_callback_info info) {
2828
return NULL;
2929
}
3030

31-
napi_value Echo(napi_env env, napi_callback_info info) {
31+
static napi_value Echo(napi_env env, napi_callback_info info) {
3232
size_t argc = 1;
3333
napi_value args[1];
3434
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -38,14 +38,14 @@ napi_value Echo(napi_env env, napi_callback_info info) {
3838
return args[0];
3939
}
4040

41-
napi_value New(napi_env env, napi_callback_info info) {
41+
static napi_value New(napi_env env, napi_callback_info info) {
4242
napi_value _this;
4343
NAPI_CALL(env, napi_get_cb_info(env, info, NULL, NULL, &_this, NULL));
4444

4545
return _this;
4646
}
4747

48-
napi_value GetStaticValue(napi_env env, napi_callback_info info) {
48+
static napi_value GetStaticValue(napi_env env, napi_callback_info info) {
4949
size_t argc = 0;
5050
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, NULL, NULL, NULL));
5151

@@ -58,7 +58,7 @@ napi_value GetStaticValue(napi_env env, napi_callback_info info) {
5858
}
5959

6060

61-
napi_value Init(napi_env env, napi_value exports) {
61+
static napi_value Init(napi_env env, napi_value exports) {
6262
napi_value number;
6363
NAPI_CALL(env, napi_create_double(env, value_, &number));
6464

‎test/addons-napi/test_constructor/test_constructor_name.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33

44
napi_ref constructor_;
55

6-
napi_value New(napi_env env, napi_callback_info info) {
6+
static napi_value New(napi_env env, napi_callback_info info) {
77
napi_value _this;
88
NAPI_CALL(env, napi_get_cb_info(env, info, NULL, NULL, &_this, NULL));
99

1010
return _this;
1111
}
1212

13-
napi_value Init(napi_env env, napi_value exports) {
13+
static napi_value Init(napi_env env, napi_value exports) {
1414
napi_value cons;
1515
NAPI_CALL(env, napi_define_class(
1616
env, "MyObject_Extra", 8, New, NULL, 0, NULL, &cons));

‎test/addons-napi/test_conversions/test_conversions.c

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <node_api.h>
22
#include "../common.h"
33

4-
napi_value AsBool(napi_env env, napi_callback_info info) {
4+
static napi_value AsBool(napi_env env, napi_callback_info info) {
55
size_t argc = 1;
66
napi_value args[1];
77
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -15,7 +15,7 @@ napi_value AsBool(napi_env env, napi_callback_info info) {
1515
return output;
1616
}
1717

18-
napi_value AsInt32(napi_env env, napi_callback_info info) {
18+
static napi_value AsInt32(napi_env env, napi_callback_info info) {
1919
size_t argc = 1;
2020
napi_value args[1];
2121
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -29,7 +29,7 @@ napi_value AsInt32(napi_env env, napi_callback_info info) {
2929
return output;
3030
}
3131

32-
napi_value AsUInt32(napi_env env, napi_callback_info info) {
32+
static napi_value AsUInt32(napi_env env, napi_callback_info info) {
3333
size_t argc = 1;
3434
napi_value args[1];
3535
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -43,7 +43,7 @@ napi_value AsUInt32(napi_env env, napi_callback_info info) {
4343
return output;
4444
}
4545

46-
napi_value AsInt64(napi_env env, napi_callback_info info) {
46+
static napi_value AsInt64(napi_env env, napi_callback_info info) {
4747
size_t argc = 1;
4848
napi_value args[1];
4949
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -57,7 +57,7 @@ napi_value AsInt64(napi_env env, napi_callback_info info) {
5757
return output;
5858
}
5959

60-
napi_value AsDouble(napi_env env, napi_callback_info info) {
60+
static napi_value AsDouble(napi_env env, napi_callback_info info) {
6161
size_t argc = 1;
6262
napi_value args[1];
6363
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -71,7 +71,7 @@ napi_value AsDouble(napi_env env, napi_callback_info info) {
7171
return output;
7272
}
7373

74-
napi_value AsString(napi_env env, napi_callback_info info) {
74+
static napi_value AsString(napi_env env, napi_callback_info info) {
7575
size_t argc = 1;
7676
napi_value args[1];
7777
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -87,7 +87,7 @@ napi_value AsString(napi_env env, napi_callback_info info) {
8787
return output;
8888
}
8989

90-
napi_value ToBool(napi_env env, napi_callback_info info) {
90+
static napi_value ToBool(napi_env env, napi_callback_info info) {
9191
size_t argc = 1;
9292
napi_value args[1];
9393
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -98,7 +98,7 @@ napi_value ToBool(napi_env env, napi_callback_info info) {
9898
return output;
9999
}
100100

101-
napi_value ToNumber(napi_env env, napi_callback_info info) {
101+
static napi_value ToNumber(napi_env env, napi_callback_info info) {
102102
size_t argc = 1;
103103
napi_value args[1];
104104
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -109,7 +109,7 @@ napi_value ToNumber(napi_env env, napi_callback_info info) {
109109
return output;
110110
}
111111

112-
napi_value ToObject(napi_env env, napi_callback_info info) {
112+
static napi_value ToObject(napi_env env, napi_callback_info info) {
113113
size_t argc = 1;
114114
napi_value args[1];
115115
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -120,7 +120,7 @@ napi_value ToObject(napi_env env, napi_callback_info info) {
120120
return output;
121121
}
122122

123-
napi_value ToString(napi_env env, napi_callback_info info) {
123+
static napi_value ToString(napi_env env, napi_callback_info info) {
124124
size_t argc = 1;
125125
napi_value args[1];
126126
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -131,7 +131,7 @@ napi_value ToString(napi_env env, napi_callback_info info) {
131131
return output;
132132
}
133133

134-
napi_value Init(napi_env env, napi_value exports) {
134+
static napi_value Init(napi_env env, napi_value exports) {
135135
napi_property_descriptor descriptors[] = {
136136
DECLARE_NAPI_PROPERTY("asBool", AsBool),
137137
DECLARE_NAPI_PROPERTY("asInt32", AsInt32),

0 commit comments

Comments
 (0)