@@ -1209,14 +1209,14 @@ napi_status napi_define_properties(napi_env env,
1209
1209
}
1210
1210
1211
1211
napi_status napi_is_array (napi_env env, napi_value value, bool * result) {
1212
- NAPI_PREAMBLE (env);
1212
+ CHECK_ENV (env);
1213
1213
CHECK_ARG (env, value);
1214
1214
CHECK_ARG (env, result);
1215
1215
1216
1216
v8::Local<v8::Value> val = v8impl::V8LocalValueFromJsValue (value);
1217
1217
1218
1218
*result = val->IsArray ();
1219
- return GET_RETURN_STATUS (env);
1219
+ return napi_clear_last_error (env);
1220
1220
}
1221
1221
1222
1222
napi_status napi_get_array_length (napi_env env,
@@ -1777,7 +1777,7 @@ napi_status napi_get_value_string_latin1(napi_env env,
1777
1777
char * buf,
1778
1778
size_t bufsize,
1779
1779
size_t * result) {
1780
- NAPI_PREAMBLE (env);
1780
+ CHECK_ENV (env);
1781
1781
CHECK_ARG (env, value);
1782
1782
1783
1783
v8::Local<v8::Value> val = v8impl::V8LocalValueFromJsValue (value);
@@ -1797,7 +1797,7 @@ napi_status napi_get_value_string_latin1(napi_env env,
1797
1797
}
1798
1798
}
1799
1799
1800
- return GET_RETURN_STATUS (env);
1800
+ return napi_clear_last_error (env);
1801
1801
}
1802
1802
1803
1803
// Copies a JavaScript string into a UTF-8 string buffer. The result is the
@@ -1813,7 +1813,7 @@ napi_status napi_get_value_string_utf8(napi_env env,
1813
1813
char * buf,
1814
1814
size_t bufsize,
1815
1815
size_t * result) {
1816
- NAPI_PREAMBLE (env);
1816
+ CHECK_ENV (env);
1817
1817
CHECK_ARG (env, value);
1818
1818
1819
1819
v8::Local<v8::Value> val = v8impl::V8LocalValueFromJsValue (value);
@@ -1833,7 +1833,7 @@ napi_status napi_get_value_string_utf8(napi_env env,
1833
1833
}
1834
1834
}
1835
1835
1836
- return GET_RETURN_STATUS (env);
1836
+ return napi_clear_last_error (env);
1837
1837
}
1838
1838
1839
1839
// Copies a JavaScript string into a UTF-16 string buffer. The result is the
@@ -1849,7 +1849,7 @@ napi_status napi_get_value_string_utf16(napi_env env,
1849
1849
char16_t * buf,
1850
1850
size_t bufsize,
1851
1851
size_t * result) {
1852
- NAPI_PREAMBLE (env);
1852
+ CHECK_ENV (env);
1853
1853
CHECK_ARG (env, value);
1854
1854
1855
1855
v8::Local<v8::Value> val = v8impl::V8LocalValueFromJsValue (value);
@@ -1870,7 +1870,7 @@ napi_status napi_get_value_string_utf16(napi_env env,
1870
1870
}
1871
1871
}
1872
1872
1873
- return GET_RETURN_STATUS (env);
1873
+ return napi_clear_last_error (env);
1874
1874
}
1875
1875
1876
1876
napi_status napi_coerce_to_object (napi_env env,
@@ -2024,13 +2024,13 @@ napi_status napi_create_external(napi_env env,
2024
2024
2025
2025
*result = v8impl::JsValueFromV8LocalValue (external_value);
2026
2026
2027
- return GET_RETURN_STATUS (env);
2027
+ return napi_clear_last_error (env);
2028
2028
}
2029
2029
2030
2030
napi_status napi_get_value_external (napi_env env,
2031
2031
napi_value value,
2032
2032
void ** result) {
2033
- NAPI_PREAMBLE (env);
2033
+ CHECK_ENV (env);
2034
2034
CHECK_ARG (env, value);
2035
2035
CHECK_ARG (env, result);
2036
2036
@@ -2040,7 +2040,7 @@ napi_status napi_get_value_external(napi_env env,
2040
2040
v8::Local<v8::External> external_value = val.As <v8::External>();
2041
2041
*result = external_value->Value ();
2042
2042
2043
- return GET_RETURN_STATUS (env);
2043
+ return napi_clear_last_error (env);
2044
2044
}
2045
2045
2046
2046
// Set initial_refcount to 0 for a weak reference, >0 for a strong reference.
@@ -2481,12 +2481,12 @@ napi_status napi_create_buffer_copy(napi_env env,
2481
2481
}
2482
2482
2483
2483
napi_status napi_is_buffer (napi_env env, napi_value value, bool * result) {
2484
- NAPI_PREAMBLE (env);
2484
+ CHECK_ENV (env);
2485
2485
CHECK_ARG (env, value);
2486
2486
CHECK_ARG (env, result);
2487
2487
2488
2488
*result = node::Buffer::HasInstance (v8impl::V8LocalValueFromJsValue (value));
2489
- return GET_RETURN_STATUS (env);
2489
+ return napi_clear_last_error (env);
2490
2490
}
2491
2491
2492
2492
napi_status napi_get_buffer_info (napi_env env,
@@ -2510,14 +2510,14 @@ napi_status napi_get_buffer_info(napi_env env,
2510
2510
}
2511
2511
2512
2512
napi_status napi_is_arraybuffer (napi_env env, napi_value value, bool * result) {
2513
- NAPI_PREAMBLE (env);
2513
+ CHECK_ENV (env);
2514
2514
CHECK_ARG (env, value);
2515
2515
CHECK_ARG (env, result);
2516
2516
2517
2517
v8::Local<v8::Value> val = v8impl::V8LocalValueFromJsValue (value);
2518
2518
*result = val->IsArrayBuffer ();
2519
2519
2520
- return GET_RETURN_STATUS (env);
2520
+ return napi_clear_last_error (env);
2521
2521
}
2522
2522
2523
2523
napi_status napi_create_arraybuffer (napi_env env,
@@ -2574,7 +2574,7 @@ napi_status napi_get_arraybuffer_info(napi_env env,
2574
2574
napi_value arraybuffer,
2575
2575
void ** data,
2576
2576
size_t * byte_length) {
2577
- NAPI_PREAMBLE (env);
2577
+ CHECK_ENV (env);
2578
2578
CHECK_ARG (env, arraybuffer);
2579
2579
2580
2580
v8::Local<v8::Value> value = v8impl::V8LocalValueFromJsValue (arraybuffer);
@@ -2591,18 +2591,18 @@ napi_status napi_get_arraybuffer_info(napi_env env,
2591
2591
*byte_length = contents.ByteLength ();
2592
2592
}
2593
2593
2594
- return GET_RETURN_STATUS (env);
2594
+ return napi_clear_last_error (env);
2595
2595
}
2596
2596
2597
2597
napi_status napi_is_typedarray (napi_env env, napi_value value, bool * result) {
2598
- NAPI_PREAMBLE (env);
2598
+ CHECK_ENV (env);
2599
2599
CHECK_ARG (env, value);
2600
2600
CHECK_ARG (env, result);
2601
2601
2602
2602
v8::Local<v8::Value> val = v8impl::V8LocalValueFromJsValue (value);
2603
2603
*result = val->IsTypedArray ();
2604
2604
2605
- return GET_RETURN_STATUS (env);
2605
+ return napi_clear_last_error (env);
2606
2606
}
2607
2607
2608
2608
napi_status napi_create_typedarray (napi_env env,
@@ -2664,7 +2664,7 @@ napi_status napi_get_typedarray_info(napi_env env,
2664
2664
void ** data,
2665
2665
napi_value* arraybuffer,
2666
2666
size_t * byte_offset) {
2667
- NAPI_PREAMBLE (env);
2667
+ CHECK_ENV (env);
2668
2668
CHECK_ARG (env, typedarray);
2669
2669
2670
2670
v8::Local<v8::Value> value = v8impl::V8LocalValueFromJsValue (typedarray);
@@ -2712,7 +2712,7 @@ napi_status napi_get_typedarray_info(napi_env env,
2712
2712
*byte_offset = array->ByteOffset ();
2713
2713
}
2714
2714
2715
- return GET_RETURN_STATUS (env);
2715
+ return napi_clear_last_error (env);
2716
2716
}
2717
2717
2718
2718
namespace uvimpl {
0 commit comments