Skip to content

Commit 9956faa

Browse files
committed
Return napi_clear_last_error() where NAPI_PREAMBLE was removed
1 parent 18fad96 commit 9956faa

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/node_api.cc

+9-9
Original file line numberDiff line numberDiff line change
@@ -2053,7 +2053,7 @@ napi_status napi_create_reference(napi_env env,
20532053
env, v8impl::V8LocalValueFromJsValue(value), initial_refcount, false);
20542054

20552055
*result = reinterpret_cast<napi_ref>(reference);
2056-
return napi_ok;
2056+
return napi_clear_last_error(env);
20572057
}
20582058

20592059
// Deletes a reference. The referenced value is released, and may be GC'd unless
@@ -2087,7 +2087,7 @@ napi_status napi_reference_ref(napi_env env, napi_ref ref, uint32_t* result) {
20872087
*result = count;
20882088
}
20892089

2090-
return napi_ok;
2090+
return napi_clear_last_error(env);
20912091
}
20922092

20932093
// Decrements the reference count, optionally returning the resulting count. If
@@ -2112,7 +2112,7 @@ napi_status napi_reference_unref(napi_env env, napi_ref ref, uint32_t* result) {
21122112
*result = count;
21132113
}
21142114

2115-
return napi_ok;
2115+
return napi_clear_last_error(env);
21162116
}
21172117

21182118
// Attempts to get a referenced value. If the reference is weak, the value might
@@ -2130,7 +2130,7 @@ napi_status napi_get_reference_value(napi_env env,
21302130
v8impl::Reference* reference = reinterpret_cast<v8impl::Reference*>(ref);
21312131
*result = v8impl::JsValueFromV8LocalValue(reference->Get());
21322132

2133-
return napi_ok;
2133+
return napi_clear_last_error(env);
21342134
}
21352135

21362136
napi_status napi_open_handle_scope(napi_env env, napi_handle_scope* result) {
@@ -2141,7 +2141,7 @@ napi_status napi_open_handle_scope(napi_env env, napi_handle_scope* result) {
21412141

21422142
*result = v8impl::JsHandleScopeFromV8HandleScope(
21432143
new v8impl::HandleScopeWrapper(env->isolate));
2144-
return napi_ok;
2144+
return napi_clear_last_error(env);
21452145
}
21462146

21472147
napi_status napi_close_handle_scope(napi_env env, napi_handle_scope scope) {
@@ -2151,7 +2151,7 @@ napi_status napi_close_handle_scope(napi_env env, napi_handle_scope scope) {
21512151
CHECK_ARG(env, scope);
21522152

21532153
delete v8impl::V8HandleScopeFromJsHandleScope(scope);
2154-
return napi_ok;
2154+
return napi_clear_last_error(env);
21552155
}
21562156

21572157
napi_status napi_open_escapable_handle_scope(
@@ -2164,7 +2164,7 @@ napi_status napi_open_escapable_handle_scope(
21642164

21652165
*result = v8impl::JsEscapableHandleScopeFromV8EscapableHandleScope(
21662166
new v8impl::EscapableHandleScopeWrapper(env->isolate));
2167-
return napi_ok;
2167+
return napi_clear_last_error(env);
21682168
}
21692169

21702170
napi_status napi_close_escapable_handle_scope(
@@ -2176,7 +2176,7 @@ napi_status napi_close_escapable_handle_scope(
21762176
CHECK_ARG(env, scope);
21772177

21782178
delete v8impl::V8EscapableHandleScopeFromJsEscapableHandleScope(scope);
2179-
return napi_ok;
2179+
return napi_clear_last_error(env);
21802180
}
21812181

21822182
napi_status napi_escape_handle(napi_env env,
@@ -2194,7 +2194,7 @@ napi_status napi_escape_handle(napi_env env,
21942194
v8impl::V8EscapableHandleScopeFromJsEscapableHandleScope(scope);
21952195
*result = v8impl::JsValueFromV8LocalValue(
21962196
s->Escape(v8impl::V8LocalValueFromJsValue(escapee)));
2197-
return napi_ok;
2197+
return napi_clear_last_error(env);
21982198
}
21992199

22002200
napi_status napi_new_instance(napi_env env,

0 commit comments

Comments
 (0)