Skip to content

Commit 5bd33f1

Browse files
sam-githubBridgeAR
sam-github
authored and
BridgeAR
committed
src: fix type mismatch warnings from missing priv
Registration initialization functions are expected to have a 4th argument, a void*, so add them where necessary to fix the warnings. PR-URL: #24737 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent 9572008 commit 5bd33f1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+96
-45
lines changed

‎src/async_wrap.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,8 @@ Local<FunctionTemplate> AsyncWrap::GetConstructorTemplate(Environment* env) {
452452

453453
void AsyncWrap::Initialize(Local<Object> target,
454454
Local<Value> unused,
455-
Local<Context> context) {
455+
Local<Context> context,
456+
void* priv) {
456457
Environment* env = Environment::GetCurrent(context);
457458
Isolate* isolate = env->isolate();
458459
HandleScope scope(isolate);

‎src/async_wrap.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ class AsyncWrap : public BaseObject {
116116

117117
static void Initialize(v8::Local<v8::Object> target,
118118
v8::Local<v8::Value> unused,
119-
v8::Local<v8::Context> context);
119+
v8::Local<v8::Context> context,
120+
void* priv);
120121

121122
static void GetAsyncId(const v8::FunctionCallbackInfo<v8::Value>& args);
122123
static void PushAsyncIds(const v8::FunctionCallbackInfo<v8::Value>& args);

‎src/bootstrapper.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,8 @@ namespace symbols {
171171

172172
void Initialize(Local<Object> target,
173173
Local<Value> unused,
174-
Local<Context> context) {
174+
Local<Context> context,
175+
void* priv) {
175176
Environment* env = Environment::GetCurrent(context);
176177
#define V(PropertyName, StringValue) \
177178
target->Set(env->context(), \

‎src/cares_wrap.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -2172,7 +2172,8 @@ void StrError(const FunctionCallbackInfo<Value>& args) {
21722172

21732173
void Initialize(Local<Object> target,
21742174
Local<Value> unused,
2175-
Local<Context> context) {
2175+
Local<Context> context,
2176+
void* priv) {
21762177
Environment* env = Environment::GetCurrent(context);
21772178

21782179
env->SetMethod(target, "getaddrinfo", GetAddrInfo);

‎src/fs_event_wrap.cc

+4-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ class FSEventWrap: public HandleWrap {
5252
public:
5353
static void Initialize(Local<Object> target,
5454
Local<Value> unused,
55-
Local<Context> context);
55+
Local<Context> context,
56+
void* priv);
5657
static void New(const FunctionCallbackInfo<Value>& args);
5758
static void Start(const FunctionCallbackInfo<Value>& args);
5859
static void GetInitialized(const FunctionCallbackInfo<Value>& args);
@@ -95,7 +96,8 @@ void FSEventWrap::GetInitialized(const FunctionCallbackInfo<Value>& args) {
9596

9697
void FSEventWrap::Initialize(Local<Object> target,
9798
Local<Value> unused,
98-
Local<Context> context) {
99+
Local<Context> context,
100+
void* priv) {
99101
Environment* env = Environment::GetCurrent(context);
100102

101103
auto fsevent_string = FIXED_ONE_BYTE_STRING(env->isolate(), "FSEvent");

‎src/heap_utils.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,8 @@ void CreateHeapDump(const FunctionCallbackInfo<Value>& args) {
247247

248248
void Initialize(Local<Object> target,
249249
Local<Value> unused,
250-
Local<Context> context) {
250+
Local<Context> context,
251+
void* priv) {
251252
Environment* env = Environment::GetCurrent(context);
252253

253254
env->SetMethodNoSideEffect(target, "buildEmbedderGraph", BuildEmbedderGraph);

‎src/js_stream.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,8 @@ void JSStream::EmitEOF(const FunctionCallbackInfo<Value>& args) {
196196

197197
void JSStream::Initialize(Local<Object> target,
198198
Local<Value> unused,
199-
Local<Context> context) {
199+
Local<Context> context,
200+
void* priv) {
200201
Environment* env = Environment::GetCurrent(context);
201202

202203
Local<FunctionTemplate> t = env->NewFunctionTemplate(New);

‎src/js_stream.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ class JSStream : public AsyncWrap, public StreamBase {
1414
public:
1515
static void Initialize(v8::Local<v8::Object> target,
1616
v8::Local<v8::Value> unused,
17-
v8::Local<v8::Context> context);
17+
v8::Local<v8::Context> context,
18+
void* priv);
1819

1920
bool IsAlive() override;
2021
bool IsClosing() override;

‎src/module_wrap.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,8 @@ void ModuleWrap::SetInitializeImportMetaObjectCallback(
821821

822822
void ModuleWrap::Initialize(Local<Object> target,
823823
Local<Value> unused,
824-
Local<Context> context) {
824+
Local<Context> context,
825+
void* priv) {
825826
Environment* env = Environment::GetCurrent(context);
826827
Isolate* isolate = env->isolate();
827828

‎src/module_wrap.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ class ModuleWrap : public BaseObject {
3838
static const std::string EXTENSIONS[];
3939
static void Initialize(v8::Local<v8::Object> target,
4040
v8::Local<v8::Value> unused,
41-
v8::Local<v8::Context> context);
41+
v8::Local<v8::Context> context,
42+
void* priv);
4243
static void HostInitializeImportMetaObjectCallback(
4344
v8::Local<v8::Context> context,
4445
v8::Local<v8::Module> module,

‎src/node_buffer.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -1083,7 +1083,8 @@ void SetupBufferJS(const FunctionCallbackInfo<Value>& args) {
10831083

10841084
void Initialize(Local<Object> target,
10851085
Local<Value> unused,
1086-
Local<Context> context) {
1086+
Local<Context> context,
1087+
void* priv) {
10871088
Environment* env = Environment::GetCurrent(context);
10881089

10891090
env->SetMethod(target, "setupBufferJS", SetupBufferJS);

‎src/node_contextify.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -1075,7 +1075,8 @@ void ContextifyContext::CompileFunction(
10751075

10761076
void Initialize(Local<Object> target,
10771077
Local<Value> unused,
1078-
Local<Context> context) {
1078+
Local<Context> context,
1079+
void* priv) {
10791080
Environment* env = Environment::GetCurrent(context);
10801081
ContextifyContext::Init(env, target);
10811082
ContextifyScript::Init(env, target);

‎src/node_domain.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ void Enable(const FunctionCallbackInfo<Value>& args) {
2222

2323
void Initialize(Local<Object> target,
2424
Local<Value> unused,
25-
Local<Context> context) {
25+
Local<Context> context,
26+
void* priv) {
2627
Environment* env = Environment::GetCurrent(context);
2728

2829
env->SetMethod(target, "enable", Enable);

‎src/node_native_module.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,8 @@ MaybeLocal<Value> NativeModuleLoader::LookupAndCompile(
317317

318318
void NativeModuleLoader::Initialize(Local<Object> target,
319319
Local<Value> unused,
320-
Local<Context> context) {
320+
Local<Context> context,
321+
void* priv) {
321322
Environment* env = Environment::GetCurrent(context);
322323

323324
env->SetMethod(

‎src/node_native_module.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ class NativeModuleLoader {
3737
NativeModuleLoader();
3838
static void Initialize(v8::Local<v8::Object> target,
3939
v8::Local<v8::Value> unused,
40-
v8::Local<v8::Context> context);
40+
v8::Local<v8::Context> context,
41+
void* priv);
4142
v8::Local<v8::Object> GetSourceObject(v8::Local<v8::Context> context) const;
4243
v8::Local<v8::String> GetSource(v8::Isolate* isolate, const char* id) const;
4344

‎src/node_options.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,8 @@ void GetOptions(const FunctionCallbackInfo<Value>& args) {
472472

473473
void Initialize(Local<Object> target,
474474
Local<Value> unused,
475-
Local<Context> context) {
475+
Local<Context> context,
476+
void* priv) {
476477
Environment* env = Environment::GetCurrent(context);
477478
Isolate* isolate = env->isolate();
478479
env->SetMethodNoSideEffect(target, "getOptions", GetOptions);

‎src/node_os.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,8 @@ static void GetPriority(const FunctionCallbackInfo<Value>& args) {
446446

447447
void Initialize(Local<Object> target,
448448
Local<Value> unused,
449-
Local<Context> context) {
449+
Local<Context> context,
450+
void* priv) {
450451
Environment* env = Environment::GetCurrent(context);
451452
env->SetMethod(target, "getHostname", GetHostname);
452453
env->SetMethod(target, "getLoadAvg", GetLoadAvg);

‎src/node_perf.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,8 @@ void Timerify(const FunctionCallbackInfo<Value>& args) {
376376

377377
void Initialize(Local<Object> target,
378378
Local<Value> unused,
379-
Local<Context> context) {
379+
Local<Context> context,
380+
void* priv) {
380381
Environment* env = Environment::GetCurrent(context);
381382
Isolate* isolate = env->isolate();
382383
performance_state* state = env->performance_state();

‎src/node_serdes.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,8 @@ void DeserializerContext::ReadRawBytes(
440440

441441
void Initialize(Local<Object> target,
442442
Local<Value> unused,
443-
Local<Context> context) {
443+
Local<Context> context,
444+
void* priv) {
444445
Environment* env = Environment::GetCurrent(context);
445446
Local<FunctionTemplate> ser =
446447
env->NewFunctionTemplate(SerializerContext::New);

‎src/node_trace_events.cc

+8-2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ using v8::Value;
2121

2222
class NodeCategorySet : public BaseObject {
2323
public:
24+
static void Initialize(Local<Object> target,
25+
Local<Value> unused,
26+
Local<Context> context,
27+
void* priv);
28+
2429
static void New(const FunctionCallbackInfo<Value>& args);
2530
static void Enable(const FunctionCallbackInfo<Value>& args);
2631
static void Disable(const FunctionCallbackInfo<Value>& args);
@@ -97,7 +102,7 @@ void GetEnabledCategories(const FunctionCallbackInfo<Value>& args) {
97102
}
98103
}
99104

100-
void Initialize(Local<Object> target,
105+
void NodeCategorySet::Initialize(Local<Object> target,
101106
Local<Value> unused,
102107
Local<Context> context,
103108
void* priv) {
@@ -136,4 +141,5 @@ void Initialize(Local<Object> target,
136141

137142
} // namespace node
138143

139-
NODE_MODULE_CONTEXT_AWARE_INTERNAL(trace_events, node::Initialize)
144+
NODE_MODULE_CONTEXT_AWARE_INTERNAL(trace_events,
145+
node::NodeCategorySet::Initialize)

‎src/node_types.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ static void IsBoxedPrimitive(const FunctionCallbackInfo<Value>& args) {
6262

6363
void InitializeTypes(Local<Object> target,
6464
Local<Value> unused,
65-
Local<Context> context) {
65+
Local<Context> context,
66+
void* priv) {
6667
Environment* env = Environment::GetCurrent(context);
6768

6869
#define V(type) env->SetMethodNoSideEffect(target, \

‎src/node_util.cc

+4-1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ static void GetOwnNonIndexProperties(
5656
}
5757

5858
static void GetPromiseDetails(const FunctionCallbackInfo<Value>& args) {
59+
Environment* env = Environment::GetCurrent(args);
5960
// Return undefined if it's not a Promise.
6061
if (!args[0]->IsPromise())
6162
return;
@@ -74,6 +75,7 @@ static void GetPromiseDetails(const FunctionCallbackInfo<Value>& args) {
7475
}
7576

7677
static void GetProxyDetails(const FunctionCallbackInfo<Value>& args) {
78+
Environment* env = Environment::GetCurrent(args);
7779
// Return undefined if it's not a proxy.
7880
if (!args[0]->IsProxy())
7981
return;
@@ -194,7 +196,8 @@ void EnqueueMicrotask(const FunctionCallbackInfo<Value>& args) {
194196

195197
void Initialize(Local<Object> target,
196198
Local<Value> unused,
197-
Local<Context> context) {
199+
Local<Context> context,
200+
void* priv) {
198201
Environment* env = Environment::GetCurrent(context);
199202

200203
#define V(name, _) \

‎src/node_v8.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,8 @@ void SetFlagsFromString(const FunctionCallbackInfo<Value>& args) {
119119

120120
void Initialize(Local<Object> target,
121121
Local<Value> unused,
122-
Local<Context> context) {
122+
Local<Context> context,
123+
void* priv) {
123124
Environment* env = Environment::GetCurrent(context);
124125

125126
env->SetMethodNoSideEffect(target, "cachedDataVersionTag",

‎src/pipe_wrap.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ Local<Object> PipeWrap::Instantiate(Environment* env,
6969

7070
void PipeWrap::Initialize(Local<Object> target,
7171
Local<Value> unused,
72-
Local<Context> context) {
72+
Local<Context> context,
73+
void* priv) {
7374
Environment* env = Environment::GetCurrent(context);
7475

7576
Local<FunctionTemplate> t = env->NewFunctionTemplate(New);

‎src/pipe_wrap.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ class PipeWrap : public ConnectionWrap<PipeWrap, uv_pipe_t> {
4343
SocketType type);
4444
static void Initialize(v8::Local<v8::Object> target,
4545
v8::Local<v8::Value> unused,
46-
v8::Local<v8::Context> context);
46+
v8::Local<v8::Context> context,
47+
void* priv);
4748

4849
SET_NO_MEMORY_INFO()
4950
SET_MEMORY_INFO_NAME(PipeWrap)

‎src/process_wrap.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ class ProcessWrap : public HandleWrap {
4949
public:
5050
static void Initialize(Local<Object> target,
5151
Local<Value> unused,
52-
Local<Context> context) {
52+
Local<Context> context,
53+
void* priv) {
5354
Environment* env = Environment::GetCurrent(context);
5455
Local<FunctionTemplate> constructor = env->NewFunctionTemplate(New);
5556
constructor->InstanceTemplate()->SetInternalFieldCount(1);

‎src/signal_wrap.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ class SignalWrap : public HandleWrap {
4343
public:
4444
static void Initialize(Local<Object> target,
4545
Local<Value> unused,
46-
Local<Context> context) {
46+
Local<Context> context,
47+
void* priv) {
4748
Environment* env = Environment::GetCurrent(context);
4849
Local<FunctionTemplate> constructor = env->NewFunctionTemplate(New);
4950
constructor->InstanceTemplate()->SetInternalFieldCount(1);

‎src/spawn_sync.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,8 @@ void SyncProcessStdioPipe::CloseCallback(uv_handle_t* handle) {
365365

366366
void SyncProcessRunner::Initialize(Local<Object> target,
367367
Local<Value> unused,
368-
Local<Context> context) {
368+
Local<Context> context,
369+
void* priv) {
369370
Environment* env = Environment::GetCurrent(context);
370371
env->SetMethod(target, "spawn", Spawn);
371372
}

‎src/spawn_sync.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@ class SyncProcessRunner {
141141
public:
142142
static void Initialize(v8::Local<v8::Object> target,
143143
v8::Local<v8::Value> unused,
144-
v8::Local<v8::Context> context);
144+
v8::Local<v8::Context> context,
145+
void* priv);
145146
static void Spawn(const v8::FunctionCallbackInfo<v8::Value>& args);
146147

147148
private:

‎src/stream_pipe.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,8 @@ namespace {
248248

249249
void InitializeStreamPipe(Local<Object> target,
250250
Local<Value> unused,
251-
Local<Context> context) {
251+
Local<Context> context,
252+
void* priv) {
252253
Environment* env = Environment::GetCurrent(context);
253254

254255
// Create FunctionTemplate for FileHandle::CloseReq

‎src/stream_wrap.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ using v8::Value;
5252

5353
void LibuvStreamWrap::Initialize(Local<Object> target,
5454
Local<Value> unused,
55-
Local<Context> context) {
55+
Local<Context> context,
56+
void* priv) {
5657
Environment* env = Environment::GetCurrent(context);
5758

5859
auto is_construct_call_callback =

‎src/stream_wrap.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ class LibuvStreamWrap : public HandleWrap, public StreamBase {
3737
public:
3838
static void Initialize(v8::Local<v8::Object> target,
3939
v8::Local<v8::Value> unused,
40-
v8::Local<v8::Context> context);
40+
v8::Local<v8::Context> context,
41+
void* priv);
4142

4243
int GetFD() override;
4344
bool IsAlive() override;

‎src/string_decoder.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,8 @@ void FlushData(const FunctionCallbackInfo<Value>& args) {
276276

277277
void InitializeStringDecoder(Local<Object> target,
278278
Local<Value> unused,
279-
Local<Context> context) {
279+
Local<Context> context,
280+
void* priv) {
280281
Environment* env = Environment::GetCurrent(context);
281282
Isolate* isolate = env->isolate();
282283

‎src/tcp_wrap.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ Local<Object> TCPWrap::Instantiate(Environment* env,
7373

7474
void TCPWrap::Initialize(Local<Object> target,
7575
Local<Value> unused,
76-
Local<Context> context) {
76+
Local<Context> context,
77+
void* priv) {
7778
Environment* env = Environment::GetCurrent(context);
7879

7980
Local<FunctionTemplate> t = env->NewFunctionTemplate(New);

‎src/tcp_wrap.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ class TCPWrap : public ConnectionWrap<TCPWrap, uv_tcp_t> {
4242
SocketType type);
4343
static void Initialize(v8::Local<v8::Object> target,
4444
v8::Local<v8::Value> unused,
45-
v8::Local<v8::Context> context);
45+
v8::Local<v8::Context> context,
46+
void* priv);
4647

4748
SET_NO_MEMORY_INFO()
4849
SET_SELF_SIZE(TCPWrap)

0 commit comments

Comments
 (0)