Return napi_clear_last_error() where NAPI_PREAMBLE was removed

jasongin · jasongin · commit 9956faa3969d · 2017-04-25T10:42:30.000-07:00
diff --git a/src/node_api.cc b/src/node_api.cc
@@ -2053,7 +2053,7 @@ napi_status napi_create_reference(napi_env env,
       env, v8impl::V8LocalValueFromJsValue(value), initial_refcount, false);
 
   *result = reinterpret_cast<napi_ref>(reference);
-  return napi_ok;
+  return napi_clear_last_error(env);
 }
 
 // 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) {
     *result = count;
   }
 
-  return napi_ok;
+  return napi_clear_last_error(env);
 }
 
 // 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) {
     *result = count;
   }
 
-  return napi_ok;
+  return napi_clear_last_error(env);
 }
 
 // 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,
   v8impl::Reference* reference = reinterpret_cast<v8impl::Reference*>(ref);
   *result = v8impl::JsValueFromV8LocalValue(reference->Get());
 
-  return napi_ok;
+  return napi_clear_last_error(env);
 }
 
 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) {
 
   *result = v8impl::JsHandleScopeFromV8HandleScope(
       new v8impl::HandleScopeWrapper(env->isolate));
-  return napi_ok;
+  return napi_clear_last_error(env);
 }
 
 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) {
   CHECK_ARG(env, scope);
 
   delete v8impl::V8HandleScopeFromJsHandleScope(scope);
-  return napi_ok;
+  return napi_clear_last_error(env);
 }
 
 napi_status napi_open_escapable_handle_scope(
@@ -2164,7 +2164,7 @@ napi_status napi_open_escapable_handle_scope(
 
   *result = v8impl::JsEscapableHandleScopeFromV8EscapableHandleScope(
       new v8impl::EscapableHandleScopeWrapper(env->isolate));
-  return napi_ok;
+  return napi_clear_last_error(env);
 }
 
 napi_status napi_close_escapable_handle_scope(
@@ -2176,7 +2176,7 @@ napi_status napi_close_escapable_handle_scope(
   CHECK_ARG(env, scope);
 
   delete v8impl::V8EscapableHandleScopeFromJsEscapableHandleScope(scope);
-  return napi_ok;
+  return napi_clear_last_error(env);
 }
 
 napi_status napi_escape_handle(napi_env env,
@@ -2194,7 +2194,7 @@ napi_status napi_escape_handle(napi_env env,
       v8impl::V8EscapableHandleScopeFromJsEscapableHandleScope(scope);
   *result = v8impl::JsValueFromV8LocalValue(
       s->Escape(v8impl::V8LocalValueFromJsValue(escapee)));
-  return napi_ok;
+  return napi_clear_last_error(env);
 }
 
 napi_status napi_new_instance(napi_env env,

Original file line number	Diff line number	Diff line change
`@@ -2053,7 +2053,7 @@ napi_status napi_create_reference(napi_env env,`
`2053`	`2053`	`env, v8impl::V8LocalValueFromJsValue(value), initial_refcount, false);`
`2054`	`2054`
`2055`	`2055`	`*result = reinterpret_cast<napi_ref>(reference);`
`2056`		`- return napi_ok;`
	`2056`	`+ return napi_clear_last_error(env);`
`2057`	`2057`	`}`
`2058`	`2058`
`2059`	`2059`	`// 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) {`
`2087`	`2087`	`*result = count;`
`2088`	`2088`	`}`
`2089`	`2089`
`2090`		`- return napi_ok;`
	`2090`	`+ return napi_clear_last_error(env);`
`2091`	`2091`	`}`
`2092`	`2092`
`2093`	`2093`	`// 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) {`
`2112`	`2112`	`*result = count;`
`2113`	`2113`	`}`
`2114`	`2114`
`2115`		`- return napi_ok;`
	`2115`	`+ return napi_clear_last_error(env);`
`2116`	`2116`	`}`
`2117`	`2117`
`2118`	`2118`	`// 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,`
`2130`	`2130`	`v8impl::Reference* reference = reinterpret_cast<v8impl::Reference*>(ref);`
`2131`	`2131`	`*result = v8impl::JsValueFromV8LocalValue(reference->Get());`
`2132`	`2132`
`2133`		`- return napi_ok;`
	`2133`	`+ return napi_clear_last_error(env);`
`2134`	`2134`	`}`
`2135`	`2135`
`2136`	`2136`	`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) {`
`2141`	`2141`
`2142`	`2142`	`*result = v8impl::JsHandleScopeFromV8HandleScope(`
`2143`	`2143`	`new v8impl::HandleScopeWrapper(env->isolate));`
`2144`		`- return napi_ok;`
	`2144`	`+ return napi_clear_last_error(env);`
`2145`	`2145`	`}`
`2146`	`2146`
`2147`	`2147`	`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) {`
`2151`	`2151`	`CHECK_ARG(env, scope);`
`2152`	`2152`
`2153`	`2153`	`delete v8impl::V8HandleScopeFromJsHandleScope(scope);`
`2154`		`- return napi_ok;`
	`2154`	`+ return napi_clear_last_error(env);`
`2155`	`2155`	`}`
`2156`	`2156`
`2157`	`2157`	`napi_status napi_open_escapable_handle_scope(`
`@@ -2164,7 +2164,7 @@ napi_status napi_open_escapable_handle_scope(`
`2164`	`2164`
`2165`	`2165`	`*result = v8impl::JsEscapableHandleScopeFromV8EscapableHandleScope(`
`2166`	`2166`	`new v8impl::EscapableHandleScopeWrapper(env->isolate));`
`2167`		`- return napi_ok;`
	`2167`	`+ return napi_clear_last_error(env);`
`2168`	`2168`	`}`
`2169`	`2169`
`2170`	`2170`	`napi_status napi_close_escapable_handle_scope(`
`@@ -2176,7 +2176,7 @@ napi_status napi_close_escapable_handle_scope(`
`2176`	`2176`	`CHECK_ARG(env, scope);`
`2177`	`2177`
`2178`	`2178`	`delete v8impl::V8EscapableHandleScopeFromJsEscapableHandleScope(scope);`
`2179`		`- return napi_ok;`
	`2179`	`+ return napi_clear_last_error(env);`
`2180`	`2180`	`}`
`2181`	`2181`
`2182`	`2182`	`napi_status napi_escape_handle(napi_env env,`
`@@ -2194,7 +2194,7 @@ napi_status napi_escape_handle(napi_env env,`
`2194`	`2194`	`v8impl::V8EscapableHandleScopeFromJsEscapableHandleScope(scope);`
`2195`	`2195`	`*result = v8impl::JsValueFromV8LocalValue(`
`2196`	`2196`	`s->Escape(v8impl::V8LocalValueFromJsValue(escapee)));`
`2197`		`- return napi_ok;`
	`2197`	`+ return napi_clear_last_error(env);`
`2198`	`2198`	`}`
`2199`	`2199`
`2200`	`2200`	`napi_status napi_new_instance(napi_env env,`