@@ -19,32 +19,32 @@ typedef struct {
19
19
napi_async_work _request ;
20
20
} carrier ;
21
21
22
- carrier the_carrier;
23
- carrier async_carrier[MAX_CANCEL_THREADS];
22
+ static carrier the_carrier ;
23
+ static carrier async_carrier [MAX_CANCEL_THREADS ];
24
24
25
- void Execute (napi_env env, void * data) {
25
+ static void Execute (napi_env env , void * data ) {
26
26
#if defined _WIN32
27
27
Sleep (1000 );
28
28
#else
29
29
sleep (1 );
30
30
#endif
31
- carrier* c = static_cast < carrier*> (data);
31
+ carrier * c = ( carrier * ) (data );
32
32
33
33
assert (c == & the_carrier );
34
34
35
35
c -> _output = c -> _input * 2 ;
36
36
}
37
37
38
- void Complete (napi_env env, napi_status status, void * data) {
39
- carrier* c = static_cast < carrier*> (data);
38
+ static void Complete (napi_env env , napi_status status , void * data ) {
39
+ carrier * c = ( carrier * ) (data );
40
40
41
41
if (c != & the_carrier ) {
42
- napi_throw_type_error (env, nullptr , " Wrong data parameter to Complete." );
42
+ napi_throw_type_error (env , NULL , "Wrong data parameter to Complete." );
43
43
return ;
44
44
}
45
45
46
46
if (status != napi_ok ) {
47
- napi_throw_type_error (env, nullptr , " Execute callback failed." );
47
+ napi_throw_type_error (env , NULL , "Execute callback failed." );
48
48
return ;
49
49
}
50
50
@@ -66,7 +66,7 @@ void Complete(napi_env env, napi_status status, void* data) {
66
66
NAPI_CALL_RETURN_VOID (env , napi_delete_async_work (env , c -> _request ));
67
67
}
68
68
69
- napi_value Test (napi_env env, napi_callback_info info) {
69
+ static napi_value Test (napi_env env , napi_callback_info info ) {
70
70
size_t argc = 3 ;
71
71
napi_value argv [3 ];
72
72
napi_value _this ;
@@ -101,16 +101,16 @@ napi_value Test(napi_env env, napi_callback_info info) {
101
101
NAPI_CALL (env ,
102
102
napi_queue_async_work (env , the_carrier ._request ));
103
103
104
- return nullptr ;
104
+ return NULL ;
105
105
}
106
106
107
- void BusyCancelComplete (napi_env env, napi_status status, void * data) {
108
- carrier* c = static_cast < carrier*> (data);
107
+ static void BusyCancelComplete (napi_env env , napi_status status , void * data ) {
108
+ carrier * c = ( carrier * ) (data );
109
109
NAPI_CALL_RETURN_VOID (env , napi_delete_async_work (env , c -> _request ));
110
110
}
111
111
112
- void CancelComplete (napi_env env, napi_status status, void * data) {
113
- carrier* c = static_cast < carrier*> (data);
112
+ static void CancelComplete (napi_env env , napi_status status , void * data ) {
113
+ carrier * c = ( carrier * ) (data );
114
114
115
115
if (status == napi_cancelled ) {
116
116
// ok we got the status we expected so make the callback to
@@ -122,22 +122,22 @@ void CancelComplete(napi_env env, napi_status status, void* data) {
122
122
NAPI_CALL_RETURN_VOID (env , napi_get_global (env , & global ));
123
123
napi_value result ;
124
124
NAPI_CALL_RETURN_VOID (env ,
125
- napi_call_function (env, global, callback, 0 , nullptr , &result));
125
+ napi_call_function (env , global , callback , 0 , NULL , & result ));
126
126
}
127
127
128
128
NAPI_CALL_RETURN_VOID (env , napi_delete_async_work (env , c -> _request ));
129
129
NAPI_CALL_RETURN_VOID (env , napi_delete_reference (env , c -> _callback ));
130
130
}
131
131
132
- void CancelExecute (napi_env env, void * data) {
132
+ static void CancelExecute (napi_env env , void * data ) {
133
133
#if defined _WIN32
134
134
Sleep (1000 );
135
135
#else
136
136
sleep (1 );
137
137
#endif
138
138
}
139
139
140
- napi_value TestCancel (napi_env env, napi_callback_info info) {
140
+ static napi_value TestCancel (napi_env env , napi_callback_info info ) {
141
141
size_t argc = 1 ;
142
142
napi_value argv [1 ];
143
143
napi_value _this ;
@@ -150,7 +150,7 @@ napi_value TestCancel(napi_env env, napi_callback_info info) {
150
150
// make sure the work we are going to cancel will not be
151
151
// able to start by using all the threads in the pool
152
152
for (int i = 1 ; i < MAX_CANCEL_THREADS ; i ++ ) {
153
- NAPI_CALL (env, napi_create_async_work (env, nullptr , resource_name,
153
+ NAPI_CALL (env , napi_create_async_work (env , NULL , resource_name ,
154
154
CancelExecute , BusyCancelComplete ,
155
155
& async_carrier [i ], & async_carrier [i ]._request ));
156
156
NAPI_CALL (env , napi_queue_async_work (env , async_carrier [i ]._request ));
@@ -162,20 +162,20 @@ napi_value TestCancel(napi_env env, napi_callback_info info) {
162
162
// workers above.
163
163
NAPI_CALL (env ,
164
164
napi_get_cb_info (env , info , & argc , argv , & _this , & data ));
165
- NAPI_CALL (env, napi_create_async_work (env, nullptr , resource_name,
165
+ NAPI_CALL (env , napi_create_async_work (env , NULL , resource_name ,
166
166
CancelExecute , CancelComplete ,
167
167
& async_carrier [0 ], & async_carrier [0 ]._request ));
168
168
NAPI_CALL (env ,
169
169
napi_create_reference (env , argv [0 ], 1 , & async_carrier [0 ]._callback ));
170
170
NAPI_CALL (env , napi_queue_async_work (env , async_carrier [0 ]._request ));
171
171
NAPI_CALL (env , napi_cancel_async_work (env , async_carrier [0 ]._request ));
172
- return nullptr ;
172
+ return NULL ;
173
173
}
174
174
175
175
struct {
176
176
napi_ref ref ;
177
177
napi_async_work work ;
178
- } repeated_work_info = { nullptr , nullptr };
178
+ } repeated_work_info = { NULL , NULL };
179
179
180
180
static void RepeatedWorkerThread (napi_env env , void * data ) {}
181
181
@@ -187,33 +187,33 @@ static void RepeatedWorkComplete(napi_env env, napi_status status, void* data) {
187
187
napi_delete_async_work (env , repeated_work_info .work ));
188
188
NAPI_CALL_RETURN_VOID (env ,
189
189
napi_delete_reference (env , repeated_work_info .ref ));
190
- repeated_work_info.work = nullptr ;
191
- repeated_work_info.ref = nullptr ;
190
+ repeated_work_info .work = NULL ;
191
+ repeated_work_info .ref = NULL ;
192
192
NAPI_CALL_RETURN_VOID (env ,
193
193
napi_create_uint32 (env , (uint32_t )status , & js_status ));
194
194
NAPI_CALL_RETURN_VOID (env ,
195
- napi_call_function (env, cb, cb, 1 , &js_status, nullptr ));
195
+ napi_call_function (env , cb , cb , 1 , & js_status , NULL ));
196
196
}
197
197
198
198
static napi_value DoRepeatedWork (napi_env env , napi_callback_info info ) {
199
199
size_t argc = 1 ;
200
200
napi_value cb , name ;
201
- NAPI_ASSERT (env, repeated_work_info.ref == nullptr ,
201
+ NAPI_ASSERT (env , repeated_work_info .ref == NULL ,
202
202
"Reference left over from previous work" );
203
- NAPI_ASSERT (env, repeated_work_info.work == nullptr ,
203
+ NAPI_ASSERT (env , repeated_work_info .work == NULL ,
204
204
"Work pointer left over from previous work" );
205
- NAPI_CALL (env, napi_get_cb_info (env, info, &argc, &cb, nullptr , nullptr ));
205
+ NAPI_CALL (env , napi_get_cb_info (env , info , & argc , & cb , NULL , NULL ));
206
206
NAPI_CALL (env , napi_create_reference (env , cb , 1 , & repeated_work_info .ref ));
207
207
NAPI_CALL (env ,
208
208
napi_create_string_utf8 (env , "Repeated Work" , NAPI_AUTO_LENGTH , & name ));
209
209
NAPI_CALL (env ,
210
- napi_create_async_work (env, nullptr , name, RepeatedWorkerThread,
210
+ napi_create_async_work (env , NULL , name , RepeatedWorkerThread ,
211
211
RepeatedWorkComplete , & repeated_work_info , & repeated_work_info .work ));
212
212
NAPI_CALL (env , napi_queue_async_work (env , repeated_work_info .work ));
213
- return nullptr ;
213
+ return NULL ;
214
214
}
215
215
216
- napi_value Init (napi_env env, napi_value exports) {
216
+ static napi_value Init (napi_env env , napi_value exports ) {
217
217
napi_property_descriptor properties [] = {
218
218
DECLARE_NAPI_PROPERTY ("Test" , Test ),
219
219
DECLARE_NAPI_PROPERTY ("TestCancel" , TestCancel ),
0 commit comments