@@ -1207,14 +1207,14 @@ napi_status napi_define_properties(napi_env env,
1207
1207
}
1208
1208
1209
1209
napi_status napi_is_array (napi_env env, napi_value value, bool * result) {
1210
- NAPI_PREAMBLE (env);
1210
+ CHECK_ENV (env);
1211
1211
CHECK_ARG (env, value);
1212
1212
CHECK_ARG (env, result);
1213
1213
1214
1214
v8::Local<v8::Value> val = v8impl::V8LocalValueFromJsValue (value);
1215
1215
1216
1216
*result = val->IsArray ();
1217
- return GET_RETURN_STATUS (env);
1217
+ return napi_clear_last_error (env);
1218
1218
}
1219
1219
1220
1220
napi_status napi_get_array_length (napi_env env,
@@ -1775,7 +1775,7 @@ napi_status napi_get_value_string_latin1(napi_env env,
1775
1775
char * buf,
1776
1776
size_t bufsize,
1777
1777
size_t * result) {
1778
- NAPI_PREAMBLE (env);
1778
+ CHECK_ENV (env);
1779
1779
CHECK_ARG (env, value);
1780
1780
1781
1781
v8::Local<v8::Value> val = v8impl::V8LocalValueFromJsValue (value);
@@ -1795,7 +1795,7 @@ napi_status napi_get_value_string_latin1(napi_env env,
1795
1795
}
1796
1796
}
1797
1797
1798
- return GET_RETURN_STATUS (env);
1798
+ return napi_clear_last_error (env);
1799
1799
}
1800
1800
1801
1801
// Copies a JavaScript string into a UTF-8 string buffer. The result is the
@@ -1811,7 +1811,7 @@ napi_status napi_get_value_string_utf8(napi_env env,
1811
1811
char * buf,
1812
1812
size_t bufsize,
1813
1813
size_t * result) {
1814
- NAPI_PREAMBLE (env);
1814
+ CHECK_ENV (env);
1815
1815
CHECK_ARG (env, value);
1816
1816
1817
1817
v8::Local<v8::Value> val = v8impl::V8LocalValueFromJsValue (value);
@@ -1831,7 +1831,7 @@ napi_status napi_get_value_string_utf8(napi_env env,
1831
1831
}
1832
1832
}
1833
1833
1834
- return GET_RETURN_STATUS (env);
1834
+ return napi_clear_last_error (env);
1835
1835
}
1836
1836
1837
1837
// Copies a JavaScript string into a UTF-16 string buffer. The result is the
@@ -1847,7 +1847,7 @@ napi_status napi_get_value_string_utf16(napi_env env,
1847
1847
char16_t * buf,
1848
1848
size_t bufsize,
1849
1849
size_t * result) {
1850
- NAPI_PREAMBLE (env);
1850
+ CHECK_ENV (env);
1851
1851
CHECK_ARG (env, value);
1852
1852
1853
1853
v8::Local<v8::Value> val = v8impl::V8LocalValueFromJsValue (value);
@@ -1868,7 +1868,7 @@ napi_status napi_get_value_string_utf16(napi_env env,
1868
1868
}
1869
1869
}
1870
1870
1871
- return GET_RETURN_STATUS (env);
1871
+ return napi_clear_last_error (env);
1872
1872
}
1873
1873
1874
1874
napi_status napi_coerce_to_object (napi_env env,
@@ -2022,13 +2022,13 @@ napi_status napi_create_external(napi_env env,
2022
2022
2023
2023
*result = v8impl::JsValueFromV8LocalValue (external_value);
2024
2024
2025
- return GET_RETURN_STATUS (env);
2025
+ return napi_clear_last_error (env);
2026
2026
}
2027
2027
2028
2028
napi_status napi_get_value_external (napi_env env,
2029
2029
napi_value value,
2030
2030
void ** result) {
2031
- NAPI_PREAMBLE (env);
2031
+ CHECK_ENV (env);
2032
2032
CHECK_ARG (env, value);
2033
2033
CHECK_ARG (env, result);
2034
2034
@@ -2038,7 +2038,7 @@ napi_status napi_get_value_external(napi_env env,
2038
2038
v8::Local<v8::External> external_value = val.As <v8::External>();
2039
2039
*result = external_value->Value ();
2040
2040
2041
- return GET_RETURN_STATUS (env);
2041
+ return napi_clear_last_error (env);
2042
2042
}
2043
2043
2044
2044
// Set initial_refcount to 0 for a weak reference, >0 for a strong reference.
@@ -2479,12 +2479,12 @@ napi_status napi_create_buffer_copy(napi_env env,
2479
2479
}
2480
2480
2481
2481
napi_status napi_is_buffer (napi_env env, napi_value value, bool * result) {
2482
- NAPI_PREAMBLE (env);
2482
+ CHECK_ENV (env);
2483
2483
CHECK_ARG (env, value);
2484
2484
CHECK_ARG (env, result);
2485
2485
2486
2486
*result = node::Buffer::HasInstance (v8impl::V8LocalValueFromJsValue (value));
2487
- return GET_RETURN_STATUS (env);
2487
+ return napi_clear_last_error (env);
2488
2488
}
2489
2489
2490
2490
napi_status napi_get_buffer_info (napi_env env,
@@ -2508,14 +2508,14 @@ napi_status napi_get_buffer_info(napi_env env,
2508
2508
}
2509
2509
2510
2510
napi_status napi_is_arraybuffer (napi_env env, napi_value value, bool * result) {
2511
- NAPI_PREAMBLE (env);
2511
+ CHECK_ENV (env);
2512
2512
CHECK_ARG (env, value);
2513
2513
CHECK_ARG (env, result);
2514
2514
2515
2515
v8::Local<v8::Value> val = v8impl::V8LocalValueFromJsValue (value);
2516
2516
*result = val->IsArrayBuffer ();
2517
2517
2518
- return GET_RETURN_STATUS (env);
2518
+ return napi_clear_last_error (env);
2519
2519
}
2520
2520
2521
2521
napi_status napi_create_arraybuffer (napi_env env,
@@ -2572,7 +2572,7 @@ napi_status napi_get_arraybuffer_info(napi_env env,
2572
2572
napi_value arraybuffer,
2573
2573
void ** data,
2574
2574
size_t * byte_length) {
2575
- NAPI_PREAMBLE (env);
2575
+ CHECK_ENV (env);
2576
2576
CHECK_ARG (env, arraybuffer);
2577
2577
2578
2578
v8::Local<v8::Value> value = v8impl::V8LocalValueFromJsValue (arraybuffer);
@@ -2589,18 +2589,18 @@ napi_status napi_get_arraybuffer_info(napi_env env,
2589
2589
*byte_length = contents.ByteLength ();
2590
2590
}
2591
2591
2592
- return GET_RETURN_STATUS (env);
2592
+ return napi_clear_last_error (env);
2593
2593
}
2594
2594
2595
2595
napi_status napi_is_typedarray (napi_env env, napi_value value, bool * result) {
2596
- NAPI_PREAMBLE (env);
2596
+ CHECK_ENV (env);
2597
2597
CHECK_ARG (env, value);
2598
2598
CHECK_ARG (env, result);
2599
2599
2600
2600
v8::Local<v8::Value> val = v8impl::V8LocalValueFromJsValue (value);
2601
2601
*result = val->IsTypedArray ();
2602
2602
2603
- return GET_RETURN_STATUS (env);
2603
+ return napi_clear_last_error (env);
2604
2604
}
2605
2605
2606
2606
napi_status napi_create_typedarray (napi_env env,
@@ -2662,7 +2662,7 @@ napi_status napi_get_typedarray_info(napi_env env,
2662
2662
void ** data,
2663
2663
napi_value* arraybuffer,
2664
2664
size_t * byte_offset) {
2665
- NAPI_PREAMBLE (env);
2665
+ CHECK_ENV (env);
2666
2666
CHECK_ARG (env, typedarray);
2667
2667
2668
2668
v8::Local<v8::Value> value = v8impl::V8LocalValueFromJsValue (typedarray);
@@ -2710,7 +2710,7 @@ napi_status napi_get_typedarray_info(napi_env env,
2710
2710
*byte_offset = array->ByteOffset ();
2711
2711
}
2712
2712
2713
- return GET_RETURN_STATUS (env);
2713
+ return napi_clear_last_error (env);
2714
2714
}
2715
2715
2716
2716
namespace uvimpl {
0 commit comments