1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

src: fix type mismatch warnings from missing priv

Browse Source 
Registration initialization functions are expected to have a 4th
argument, a void*, so add them where necessary to fix the warnings.

PR-URL: https://github.com/nodejs/node/pull/24737
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
This commit is contained in:
Sam Roberts 2018-11-29 17:24:47 -08:00
parent 02cd7069a8
commit 0c65314e0e
43 changed files with 96 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/async_wrap.cc
View File

@ -440,7 +440,8 @@ Local<FunctionTemplate> AsyncWrap::GetConstructorTemplate(Environment* env) {
void AsyncWrap::Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
Isolate* isolate = env->isolate();
HandleScope scope(isolate);

3
src/async_wrap.h
View File

@ -116,7 +116,8 @@ class AsyncWrap : public BaseObject {
static void Initialize(v8::Local<v8::Object> target,
v8::Local<v8::Value> unused,
v8::Local<v8::Context> context);
v8::Local<v8::Context> context,
void* priv);
static void GetAsyncId(const v8::FunctionCallbackInfo<v8::Value>& args);
static void PushAsyncIds(const v8::FunctionCallbackInfo<v8::Value>& args);

3
src/bootstrapper.cc
View File

@ -171,7 +171,8 @@ namespace symbols {
void Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
#define V(PropertyName, StringValue) \
target->Set(env->context(), \

3
src/cares_wrap.cc
View File

@ -2172,7 +2172,8 @@ void StrError(const FunctionCallbackInfo<Value>& args) {
void Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
env->SetMethod(target, "getaddrinfo", GetAddrInfo);

6
src/fs_event_wrap.cc
View File

@ -52,7 +52,8 @@ class FSEventWrap: public HandleWrap {
public:
static void Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context);
Local<Context> context,
void* priv);
static void New(const FunctionCallbackInfo<Value>& args);
static void Start(const FunctionCallbackInfo<Value>& args);
static void GetInitialized(const FunctionCallbackInfo<Value>& args);
@ -95,7 +96,8 @@ void FSEventWrap::GetInitialized(const FunctionCallbackInfo<Value>& args) {
void FSEventWrap::Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
auto fsevent_string = FIXED_ONE_BYTE_STRING(env->isolate(), "FSEvent");

3
src/heap_utils.cc
View File

@ -247,7 +247,8 @@ void CreateHeapDump(const FunctionCallbackInfo<Value>& args) {
void Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
env->SetMethodNoSideEffect(target, "buildEmbedderGraph", BuildEmbedderGraph);

3
src/js_stream.cc
View File

@ -196,7 +196,8 @@ void JSStream::EmitEOF(const FunctionCallbackInfo<Value>& args) {
void JSStream::Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
Local<FunctionTemplate> t = env->NewFunctionTemplate(New);

3
src/js_stream.h
View File

@ -14,7 +14,8 @@ class JSStream : public AsyncWrap, public StreamBase {
public:
static void Initialize(v8::Local<v8::Object> target,
v8::Local<v8::Value> unused,
v8::Local<v8::Context> context);
v8::Local<v8::Context> context,
void* priv);
bool IsAlive() override;
bool IsClosing() override;

3
src/module_wrap.cc
View File

@ -821,7 +821,8 @@ void ModuleWrap::SetInitializeImportMetaObjectCallback(
void ModuleWrap::Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
Isolate* isolate = env->isolate();

3
src/module_wrap.h
View File

@ -38,7 +38,8 @@ class ModuleWrap : public BaseObject {
static const std::string EXTENSIONS[];
static void Initialize(v8::Local<v8::Object> target,
v8::Local<v8::Value> unused,
v8::Local<v8::Context> context);
v8::Local<v8::Context> context,
void* priv);
static void HostInitializeImportMetaObjectCallback(
v8::Local<v8::Context> context,
v8::Local<v8::Module> module,

3
src/node_buffer.cc
View File

@ -1085,7 +1085,8 @@ void SetupBufferJS(const FunctionCallbackInfo<Value>& args) {
void Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
env->SetMethod(target, "setupBufferJS", SetupBufferJS);

3
src/node_contextify.cc
View File

@ -1075,7 +1075,8 @@ void ContextifyContext::CompileFunction(
void Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
ContextifyContext::Init(env, target);
ContextifyScript::Init(env, target);

3
src/node_domain.cc
View File

@ -22,7 +22,8 @@ void Enable(const FunctionCallbackInfo<Value>& args) {
void Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
env->SetMethod(target, "enable", Enable);

3
src/node_native_module.cc
View File

@ -317,7 +317,8 @@ MaybeLocal<Value> NativeModuleLoader::LookupAndCompile(
void NativeModuleLoader::Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
env->SetMethod(

3
src/node_native_module.h
View File

@ -37,7 +37,8 @@ class NativeModuleLoader {
NativeModuleLoader();
static void Initialize(v8::Local<v8::Object> target,
v8::Local<v8::Value> unused,
v8::Local<v8::Context> context);
v8::Local<v8::Context> context,
void* priv);
v8::Local<v8::Object> GetSourceObject(v8::Local<v8::Context> context) const;
v8::Local<v8::String> GetSource(v8::Isolate* isolate, const char* id) const;

3
src/node_options.cc
View File

@ -483,7 +483,8 @@ void GetOptions(const FunctionCallbackInfo<Value>& args) {
void Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
Isolate* isolate = env->isolate();
env->SetMethodNoSideEffect(target, "getOptions", GetOptions);

3
src/node_os.cc
View File

@ -446,7 +446,8 @@ static void GetPriority(const FunctionCallbackInfo<Value>& args) {
void Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
env->SetMethod(target, "getHostname", GetHostname);
env->SetMethod(target, "getLoadAvg", GetLoadAvg);

3
src/node_perf.cc
View File

@ -376,7 +376,8 @@ void Timerify(const FunctionCallbackInfo<Value>& args) {
void Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
Isolate* isolate = env->isolate();
performance_state* state = env->performance_state();

3
src/node_serdes.cc
View File

@ -440,7 +440,8 @@ void DeserializerContext::ReadRawBytes(
void Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
Local<FunctionTemplate> ser =
env->NewFunctionTemplate(SerializerContext::New);

10
src/node_trace_events.cc
View File

@ -21,6 +21,11 @@ using v8::Value;
class NodeCategorySet : public BaseObject {
public:
static void Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context,
void* priv);
static void New(const FunctionCallbackInfo<Value>& args);
static void Enable(const FunctionCallbackInfo<Value>& args);
static void Disable(const FunctionCallbackInfo<Value>& args);
@ -97,7 +102,7 @@ void GetEnabledCategories(const FunctionCallbackInfo<Value>& args) {
}
}
void Initialize(Local<Object> target,
void NodeCategorySet::Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context,
void* priv) {
@ -136,4 +141,5 @@ void Initialize(Local<Object> target,
} // namespace node
NODE_MODULE_CONTEXT_AWARE_INTERNAL(trace_events, node::Initialize)
NODE_MODULE_CONTEXT_AWARE_INTERNAL(trace_events,
node::NodeCategorySet::Initialize)

3
src/node_types.cc
View File

@ -62,7 +62,8 @@ static void IsBoxedPrimitive(const FunctionCallbackInfo<Value>& args) {
void InitializeTypes(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
#define V(type) env->SetMethodNoSideEffect(target, \

5
src/node_util.cc
View File

@ -56,6 +56,7 @@ static void GetOwnNonIndexProperties(
}
static void GetPromiseDetails(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);
// Return undefined if it's not a Promise.
if (!args[0]->IsPromise())
return;
@ -74,6 +75,7 @@ static void GetPromiseDetails(const FunctionCallbackInfo<Value>& args) {
}
static void GetProxyDetails(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);
// Return undefined if it's not a proxy.
if (!args[0]->IsProxy())
return;
@ -194,7 +196,8 @@ void EnqueueMicrotask(const FunctionCallbackInfo<Value>& args) {
void Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
#define V(name, _) \

3
src/node_v8.cc
View File

@ -119,7 +119,8 @@ void SetFlagsFromString(const FunctionCallbackInfo<Value>& args) {
void Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
env->SetMethodNoSideEffect(target, "cachedDataVersionTag",

3
src/pipe_wrap.cc
View File

@ -69,7 +69,8 @@ Local<Object> PipeWrap::Instantiate(Environment* env,
void PipeWrap::Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
Local<FunctionTemplate> t = env->NewFunctionTemplate(New);

3
src/pipe_wrap.h
View File

@ -43,7 +43,8 @@ class PipeWrap : public ConnectionWrap<PipeWrap, uv_pipe_t> {
SocketType type);
static void Initialize(v8::Local<v8::Object> target,
v8::Local<v8::Value> unused,
v8::Local<v8::Context> context);
v8::Local<v8::Context> context,
void* priv);
SET_NO_MEMORY_INFO()
SET_MEMORY_INFO_NAME(PipeWrap)

3
src/process_wrap.cc
View File

@ -49,7 +49,8 @@ class ProcessWrap : public HandleWrap {
public:
static void Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
Local<FunctionTemplate> constructor = env->NewFunctionTemplate(New);
constructor->InstanceTemplate()->SetInternalFieldCount(1);

3
src/signal_wrap.cc
View File

@ -43,7 +43,8 @@ class SignalWrap : public HandleWrap {
public:
static void Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
Local<FunctionTemplate> constructor = env->NewFunctionTemplate(New);
constructor->InstanceTemplate()->SetInternalFieldCount(1);

3
src/spawn_sync.cc
View File

@ -365,7 +365,8 @@ void SyncProcessStdioPipe::CloseCallback(uv_handle_t* handle) {
void SyncProcessRunner::Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
env->SetMethod(target, "spawn", Spawn);
}

3
src/spawn_sync.h
View File

@ -141,7 +141,8 @@ class SyncProcessRunner {
public:
static void Initialize(v8::Local<v8::Object> target,
v8::Local<v8::Value> unused,
v8::Local<v8::Context> context);
v8::Local<v8::Context> context,
void* priv);
static void Spawn(const v8::FunctionCallbackInfo<v8::Value>& args);
private:

3
src/stream_pipe.cc
View File

@ -248,7 +248,8 @@ namespace {
void InitializeStreamPipe(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
// Create FunctionTemplate for FileHandle::CloseReq

3
src/stream_wrap.cc
View File

@ -52,7 +52,8 @@ using v8::Value;
void LibuvStreamWrap::Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
auto is_construct_call_callback =

3
src/stream_wrap.h
View File

@ -37,7 +37,8 @@ class LibuvStreamWrap : public HandleWrap, public StreamBase {
public:
static void Initialize(v8::Local<v8::Object> target,
v8::Local<v8::Value> unused,
v8::Local<v8::Context> context);
v8::Local<v8::Context> context,
void* priv);
int GetFD() override;
bool IsAlive() override;

3
src/string_decoder.cc
View File

@ -276,7 +276,8 @@ void FlushData(const FunctionCallbackInfo<Value>& args) {
void InitializeStringDecoder(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
Isolate* isolate = env->isolate();

3
src/tcp_wrap.cc
View File

@ -73,7 +73,8 @@ Local<Object> TCPWrap::Instantiate(Environment* env,
void TCPWrap::Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
Local<FunctionTemplate> t = env->NewFunctionTemplate(New);

3
src/tcp_wrap.h
View File

@ -42,7 +42,8 @@ class TCPWrap : public ConnectionWrap<TCPWrap, uv_tcp_t> {
SocketType type);
static void Initialize(v8::Local<v8::Object> target,
v8::Local<v8::Value> unused,
v8::Local<v8::Context> context);
v8::Local<v8::Context> context,
void* priv);
SET_NO_MEMORY_INFO()
SET_SELF_SIZE(TCPWrap)

3
src/timers.cc
View File

@ -43,7 +43,8 @@ void ToggleImmediateRef(const FunctionCallbackInfo<Value>& args) {
void Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
env->SetMethod(target, "getLibuvNow", GetLibuvNow);

3
src/tls_wrap.cc
View File

@ -871,7 +871,8 @@ void TLSWrap::MemoryInfo(MemoryTracker* tracker) const {
void TLSWrap::Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
env->SetMethod(target, "wrap", TLSWrap::Wrap);

3
src/tls_wrap.h
View File

@ -54,7 +54,8 @@ class TLSWrap : public AsyncWrap,
static void Initialize(v8::Local<v8::Object> target,
v8::Local<v8::Value> unused,
v8::Local<v8::Context> context);
v8::Local<v8::Context> context,
void* priv);
int GetFD() override;
bool IsAlive() override;

3
src/tty_wrap.cc
View File

@ -43,7 +43,8 @@ using v8::Value;
void TTYWrap::Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
Local<String> ttyString = FIXED_ONE_BYTE_STRING(env->isolate(), "TTY");

3
src/tty_wrap.h
View File

@ -34,7 +34,8 @@ class TTYWrap : public LibuvStreamWrap {
public:
static void Initialize(v8::Local<v8::Object> target,
v8::Local<v8::Value> unused,
v8::Local<v8::Context> context);
v8::Local<v8::Context> context,
void* priv);
SET_NO_MEMORY_INFO()
SET_MEMORY_INFO_NAME(TTYWrap)

3
src/udp_wrap.cc
View File

@ -88,7 +88,8 @@ UDPWrap::UDPWrap(Environment* env, Local<Object> object)
void UDPWrap::Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
Local<FunctionTemplate> t = env->NewFunctionTemplate(New);

3
src/udp_wrap.h
View File

@ -39,7 +39,8 @@ class UDPWrap: public HandleWrap {
};
static void Initialize(v8::Local<v8::Object> target,
v8::Local<v8::Value> unused,
v8::Local<v8::Context> context);
v8::Local<v8::Context> context,
void* priv);
static void GetFD(const v8::FunctionCallbackInfo<v8::Value>& args);
static void New(const v8::FunctionCallbackInfo<v8::Value>& args);
static void Open(const v8::FunctionCallbackInfo<v8::Value>& args);

3
src/uv.cc
View File

@ -60,7 +60,8 @@ void ErrName(const FunctionCallbackInfo<Value>& args) {
void Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Local<Context> context,
void* priv) {
Environment* env = Environment::GetCurrent(context);
Isolate* isolate = env->isolate();
target->Set(env->context(),