Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

node-api: cleanup redundant static modifiers #44301

Closed
wants to merge 1 commit into from
Closed

node-api: cleanup redundant static modifiers #44301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 16 additions & 18 deletions src/js_native_api_v8.cc
View file
Open in desktop
Expand Up @@ -61,7 +61,7 @@ namespace v8impl {

namespace {

inline static napi_status V8NameFromPropertyDescriptor(
inline napi_status V8NameFromPropertyDescriptor(
napi_env env,
const napi_property_descriptor* p,
v8::Local<v8::Name>* result) {
Expand All @@ -79,7 +79,7 @@ inline static napi_status V8NameFromPropertyDescriptor(
}

// convert from n-api property attributes to v8::PropertyAttribute
inline static v8::PropertyAttribute V8PropertyAttributesFromDescriptor(
inline v8::PropertyAttribute V8PropertyAttributesFromDescriptor(
const napi_property_descriptor* descriptor) {
unsigned int attribute_flags = v8::PropertyAttribute::None;

Expand All @@ -100,12 +100,12 @@ inline static v8::PropertyAttribute V8PropertyAttributesFromDescriptor(
return static_cast<v8::PropertyAttribute>(attribute_flags);
}

inline static napi_deferred JsDeferredFromNodePersistent(
inline napi_deferred JsDeferredFromNodePersistent(
v8impl::Persistent<v8::Value>* local) {
return reinterpret_cast<napi_deferred>(local);
}

inline static v8impl::Persistent<v8::Value>* NodePersistentFromJsDeferred(
inline v8impl::Persistent<v8::Value>* NodePersistentFromJsDeferred(
napi_deferred local) {
return reinterpret_cast<v8impl::Persistent<v8::Value>*>(local);
}
Expand Down Expand Up @@ -139,32 +139,30 @@ class EscapableHandleScopeWrapper {
bool escape_called_;
};

inline static napi_handle_scope JsHandleScopeFromV8HandleScope(
HandleScopeWrapper* s) {
inline napi_handle_scope JsHandleScopeFromV8HandleScope(HandleScopeWrapper* s) {
return reinterpret_cast<napi_handle_scope>(s);
}

inline static HandleScopeWrapper* V8HandleScopeFromJsHandleScope(
napi_handle_scope s) {
inline HandleScopeWrapper* V8HandleScopeFromJsHandleScope(napi_handle_scope s) {
return reinterpret_cast<HandleScopeWrapper*>(s);
}

inline static napi_escapable_handle_scope
inline napi_escapable_handle_scope
JsEscapableHandleScopeFromV8EscapableHandleScope(
EscapableHandleScopeWrapper* s) {
return reinterpret_cast<napi_escapable_handle_scope>(s);
}

inline static EscapableHandleScopeWrapper*
inline EscapableHandleScopeWrapper*
V8EscapableHandleScopeFromJsEscapableHandleScope(
napi_escapable_handle_scope s) {
return reinterpret_cast<EscapableHandleScopeWrapper*>(s);
}

inline static napi_status ConcludeDeferred(napi_env env,
napi_deferred deferred,
napi_value result,
bool is_resolved) {
inline napi_status ConcludeDeferred(napi_env env,
napi_deferred deferred,
napi_value result,
bool is_resolved) {
NAPI_PREAMBLE(env);
CHECK_ARG(env, result);

Expand All @@ -191,10 +189,10 @@ inline static napi_status ConcludeDeferred(napi_env env,

enum UnwrapAction { KeepWrap, RemoveWrap };

inline static napi_status Unwrap(napi_env env,
napi_value js_object,
void** result,
UnwrapAction action) {
inline napi_status Unwrap(napi_env env,
napi_value js_object,
void** result,
UnwrapAction action) {
NAPI_PREAMBLE(env);
CHECK_ARG(env, js_object);
if (action == KeepWrap) {
Expand Down
24 changes: 11 additions & 13 deletions src/js_native_api_v8.h
View file
Open in desktop
@@ -1,8 +1,6 @@
#ifndef SRC_JS_NATIVE_API_V8_H_
#define SRC_JS_NATIVE_API_V8_H_

// This file needs to be compatible with C compilers.
legendecas marked this conversation as resolved.
Show resolved Hide resolved
#include <string.h> // NOLINT(modernize-deprecated-headers)
#include "js_native_api_types.h"
#include "js_native_api_v8_internals.h"

Expand Down Expand Up @@ -152,7 +150,7 @@ class EnvRefHolder {
napi_env _env;
};

static inline napi_status napi_clear_last_error(napi_env env) {
inline napi_status napi_clear_last_error(napi_env env) {
env->last_error.error_code = napi_ok;

// TODO(boingoing): Should this be a callback?
Expand All @@ -162,10 +160,10 @@ static inline napi_status napi_clear_last_error(napi_env env) {
return napi_ok;
}

static inline napi_status napi_set_last_error(napi_env env,
napi_status error_code,
uint32_t engine_error_code = 0,
void* engine_reserved = nullptr) {
inline napi_status napi_set_last_error(napi_env env,
napi_status error_code,
uint32_t engine_error_code = 0,
void* engine_reserved = nullptr) {
env->last_error.error_code = error_code;
env->last_error.engine_error_code = engine_error_code;
env->last_error.engine_reserved = engine_reserved;
Expand Down Expand Up @@ -275,6 +273,12 @@ static inline napi_status napi_set_last_error(napi_env env,
#define CHECK_MAYBE_EMPTY_WITH_PREAMBLE(env, maybe, status) \
RETURN_STATUS_IF_FALSE_WITH_PREAMBLE((env), !((maybe).IsEmpty()), (status))

#define STATUS_CALL(call) \
do { \
napi_status status = (call); \
if (status != napi_ok) return status; \
} while (0)

namespace v8impl {

//=== Conversion between V8 Handles and napi_value ========================
Expand Down Expand Up @@ -431,10 +435,4 @@ class Reference : public RefBase {

} // end of namespace v8impl

#define STATUS_CALL(call) \
do { \
napi_status status = (call); \
if (status != napi_ok) return status; \
} while (0)

#endif // SRC_JS_NATIVE_API_V8_H_
5 changes: 3 additions & 2 deletions src/node_api.cc
View file
Open in desktop
Expand Up @@ -16,6 +16,7 @@
#include "util-inl.h"

#include <atomic>
#include <cstring>
#include <memory>

node_napi_env__::node_napi_env__(v8::Local<v8::Context> context,
Expand Down Expand Up @@ -124,8 +125,8 @@ class BufferFinalizer : private Finalizer {
};
};

static inline napi_env NewEnv(v8::Local<v8::Context> context,
const std::string& module_filename) {
inline napi_env NewEnv(v8::Local<v8::Context> context,
const std::string& module_filename) {
node_napi_env result;

result = new node_napi_env__(context, module_filename);
Expand Down