@@ -19,32 +19,32 @@ typedef struct {
1919 napi_async_work _request ;
2020} carrier ;
2121
22- carrier the_carrier;
23- carrier async_carrier[MAX_CANCEL_THREADS];
22+ static carrier the_carrier ;
23+ static carrier async_carrier [MAX_CANCEL_THREADS ];
2424
25- void Execute (napi_env env, void * data) {
25+ static void Execute (napi_env env , void * data ) {
2626#if defined _WIN32
2727 Sleep (1000 );
2828#else
2929 sleep (1 );
3030#endif
31- carrier* c = static_cast < carrier*> (data);
31+ carrier * c = ( carrier * ) (data );
3232
3333 assert (c == & the_carrier );
3434
3535 c -> _output = c -> _input * 2 ;
3636}
3737
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 );
4040
4141 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." );
4343 return ;
4444 }
4545
4646 if (status != napi_ok ) {
47- napi_throw_type_error (env, nullptr , " Execute callback failed." );
47+ napi_throw_type_error (env , NULL , "Execute callback failed." );
4848 return ;
4949 }
5050
@@ -66,7 +66,7 @@ void Complete(napi_env env, napi_status status, void* data) {
6666 NAPI_CALL_RETURN_VOID (env , napi_delete_async_work (env , c -> _request ));
6767}
6868
69- napi_value Test (napi_env env, napi_callback_info info) {
69+ static napi_value Test (napi_env env , napi_callback_info info ) {
7070 size_t argc = 3 ;
7171 napi_value argv [3 ];
7272 napi_value _this ;
@@ -101,16 +101,16 @@ napi_value Test(napi_env env, napi_callback_info info) {
101101 NAPI_CALL (env ,
102102 napi_queue_async_work (env , the_carrier ._request ));
103103
104- return nullptr ;
104+ return NULL ;
105105}
106106
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 );
109109 NAPI_CALL_RETURN_VOID (env , napi_delete_async_work (env , c -> _request ));
110110}
111111
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 );
114114
115115 if (status == napi_cancelled ) {
116116 // 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) {
122122 NAPI_CALL_RETURN_VOID (env , napi_get_global (env , & global ));
123123 napi_value result ;
124124 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 ));
126126 }
127127
128128 NAPI_CALL_RETURN_VOID (env , napi_delete_async_work (env , c -> _request ));
129129 NAPI_CALL_RETURN_VOID (env , napi_delete_reference (env , c -> _callback ));
130130}
131131
132- void CancelExecute (napi_env env, void * data) {
132+ static void CancelExecute (napi_env env , void * data ) {
133133#if defined _WIN32
134134 Sleep (1000 );
135135#else
136136 sleep (1 );
137137#endif
138138}
139139
140- napi_value TestCancel (napi_env env, napi_callback_info info) {
140+ static napi_value TestCancel (napi_env env , napi_callback_info info ) {
141141 size_t argc = 1 ;
142142 napi_value argv [1 ];
143143 napi_value _this ;
@@ -150,7 +150,7 @@ napi_value TestCancel(napi_env env, napi_callback_info info) {
150150 // make sure the work we are going to cancel will not be
151151 // able to start by using all the threads in the pool
152152 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 ,
154154 CancelExecute , BusyCancelComplete ,
155155 & async_carrier [i ], & async_carrier [i ]._request ));
156156 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) {
162162 // workers above.
163163 NAPI_CALL (env ,
164164 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 ,
166166 CancelExecute , CancelComplete ,
167167 & async_carrier [0 ], & async_carrier [0 ]._request ));
168168 NAPI_CALL (env ,
169169 napi_create_reference (env , argv [0 ], 1 , & async_carrier [0 ]._callback ));
170170 NAPI_CALL (env , napi_queue_async_work (env , async_carrier [0 ]._request ));
171171 NAPI_CALL (env , napi_cancel_async_work (env , async_carrier [0 ]._request ));
172- return nullptr ;
172+ return NULL ;
173173}
174174
175175struct {
176176 napi_ref ref ;
177177 napi_async_work work ;
178- } repeated_work_info = { nullptr , nullptr };
178+ } repeated_work_info = { NULL , NULL };
179179
180180static void RepeatedWorkerThread (napi_env env , void * data ) {}
181181
@@ -187,33 +187,33 @@ static void RepeatedWorkComplete(napi_env env, napi_status status, void* data) {
187187 napi_delete_async_work (env , repeated_work_info .work ));
188188 NAPI_CALL_RETURN_VOID (env ,
189189 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 ;
192192 NAPI_CALL_RETURN_VOID (env ,
193193 napi_create_uint32 (env , (uint32_t )status , & js_status ));
194194 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 ));
196196}
197197
198198static napi_value DoRepeatedWork (napi_env env , napi_callback_info info ) {
199199 size_t argc = 1 ;
200200 napi_value cb , name ;
201- NAPI_ASSERT (env, repeated_work_info.ref == nullptr ,
201+ NAPI_ASSERT (env , repeated_work_info .ref == NULL ,
202202 "Reference left over from previous work" );
203- NAPI_ASSERT (env, repeated_work_info.work == nullptr ,
203+ NAPI_ASSERT (env , repeated_work_info .work == NULL ,
204204 "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 ));
206206 NAPI_CALL (env , napi_create_reference (env , cb , 1 , & repeated_work_info .ref ));
207207 NAPI_CALL (env ,
208208 napi_create_string_utf8 (env , "Repeated Work" , NAPI_AUTO_LENGTH , & name ));
209209 NAPI_CALL (env ,
210- napi_create_async_work (env, nullptr , name, RepeatedWorkerThread,
210+ napi_create_async_work (env , NULL , name , RepeatedWorkerThread ,
211211 RepeatedWorkComplete , & repeated_work_info , & repeated_work_info .work ));
212212 NAPI_CALL (env , napi_queue_async_work (env , repeated_work_info .work ));
213- return nullptr ;
213+ return NULL ;
214214}
215215
216- napi_value Init (napi_env env, napi_value exports) {
216+ static napi_value Init (napi_env env , napi_value exports ) {
217217 napi_property_descriptor properties [] = {
218218 DECLARE_NAPI_PROPERTY ("Test" , Test ),
219219 DECLARE_NAPI_PROPERTY ("TestCancel" , TestCancel ),
0 commit comments