Skip to content

Commit c7d7ae1

Browse files
bnoordhuisbnoordhuis
committed
src: pass node_isolate to Null()
1 parent 109f73b commit c7d7ae1

10 files changed

Lines changed: 28 additions & 28 deletions

‎src/cares_wrap.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@ static Handle<Value> Query(const Arguments& args) {
685685
if (r) {
686686
SetAresErrno(r);
687687
delete wrap;
688-
return scope.Close(v8::Null());
688+
return scope.Close(v8::Null(node_isolate));
689689
} else {
690690
return scope.Close(object);
691691
}
@@ -715,7 +715,7 @@ static Handle<Value> QueryWithFamily(const Arguments& args) {
715715
if (r) {
716716
SetAresErrno(r);
717717
delete wrap;
718-
return scope.Close(v8::Null());
718+
return scope.Close(v8::Null(node_isolate));
719719
} else {
720720
return scope.Close(object);
721721
}
@@ -732,7 +732,7 @@ void AfterGetAddrInfo(uv_getaddrinfo_t* req, int status, struct addrinfo* res) {
732732
if (status) {
733733
// Error
734734
SetErrno(uv_last_error(uv_default_loop()));
735-
argv[0] = Local<Value>::New(node_isolate, Null());
735+
argv[0] = Local<Value>::New(node_isolate, Null(node_isolate));
736736
} else {
737737
// Success
738738
struct addrinfo *address;
@@ -871,7 +871,7 @@ static Handle<Value> GetAddrInfo(const Arguments& args) {
871871
if (r) {
872872
SetErrno(uv_last_error(uv_default_loop()));
873873
delete req_wrap;
874-
return scope.Close(v8::Null());
874+
return scope.Close(v8::Null(node_isolate));
875875
} else {
876876
return scope.Close(req_wrap->object_);
877877
}

‎src/fs_event_wrap.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ void FSEventWrap::OnEvent(uv_fs_event_t* handle, const char* filename,
153153
Integer::New(status, node_isolate),
154154
eventStr,
155155
filename ? static_cast<Local<Value> >(String::New(filename))
156-
: Local<Value>::New(node_isolate, v8::Null())
156+
: Local<Value>::New(node_isolate, v8::Null(node_isolate))
157157
};
158158

159159
if (onchange_sym.IsEmpty()) {

‎src/handle_wrap.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ Handle<Value> HandleWrap::Close(const Arguments& args) {
9797
wrap->handle__ = NULL;
9898
}
9999

100-
return v8::Null();
100+
return v8::Null(node_isolate);
101101
}
102102

103103

‎src/node_crypto.cc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1095,7 +1095,7 @@ int Connection::SelectNextProtoCallback_(SSL *s,
10951095

10961096
switch (status) {
10971097
case OPENSSL_NPN_UNSUPPORTED:
1098-
p->selectedNPNProto_ = Persistent<Value>::New(Null());
1098+
p->selectedNPNProto_ = Persistent<Value>::New(Null(node_isolate));
10991099
break;
11001100
case OPENSSL_NPN_NEGOTIATED:
11011101
p->selectedNPNProto_ = Persistent<Value>::New(String::New(
@@ -1617,7 +1617,7 @@ Handle<Value> Connection::GetSession(const Arguments& args) {
16171617
return scope.Close(s);
16181618
}
16191619

1620-
return Null();
1620+
return Null(node_isolate);
16211621
}
16221622

16231623
Handle<Value> Connection::SetSession(const Arguments& args) {
@@ -1768,7 +1768,7 @@ Handle<Value> Connection::VerifyError(const Arguments& args) {
17681768

17691769
Connection *ss = Connection::Unwrap(args);
17701770

1771-
if (ss->ssl_ == NULL) return Null();
1771+
if (ss->ssl_ == NULL) return Null(node_isolate);
17721772

17731773

17741774
// XXX Do this check in JS land?
@@ -1789,7 +1789,7 @@ Handle<Value> Connection::VerifyError(const Arguments& args) {
17891789

17901790
switch (x509_verify_error) {
17911791
case X509_V_OK:
1792-
return Null();
1792+
return Null(node_isolate);
17931793

17941794
case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
17951795
s = String::New("UNABLE_TO_GET_ISSUER_CERT");
@@ -3898,12 +3898,12 @@ void RandomBytesCheck(RandomBytesRequest* req, Local<Value> argv[2]) {
38983898
ERR_error_string_n(req->error_, errmsg, sizeof errmsg);
38993899

39003900
argv[0] = Exception::Error(String::New(errmsg));
3901-
argv[1] = Local<Value>::New(node_isolate, Null());
3901+
argv[1] = Local<Value>::New(node_isolate, Null(node_isolate));
39023902
}
39033903
else {
39043904
// avoids the malloc + memcpy
39053905
Buffer* buffer = Buffer::New(req->data_, req->size_, RandomBytesFree, NULL);
3906-
argv[0] = Local<Value>::New(node_isolate, Null());
3906+
argv[0] = Local<Value>::New(node_isolate, Null(node_isolate));
39073907
argv[1] = Local<Object>::New(node_isolate, buffer->handle_);
39083908
}
39093909
}

‎src/node_file.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ static void After(uv_fs_t *req) {
113113
}
114114
} else {
115115
// error value is empty or null for non-error.
116-
argv[0] = Local<Value>::New(node_isolate, Null());
116+
argv[0] = Local<Value>::New(node_isolate, Null(node_isolate));
117117

118118
// All have at least two args now.
119119
argc = 2;

‎src/pipe_wrap.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ Handle<Value> PipeWrap::SetPendingInstances(const Arguments& args) {
160160

161161
uv_pipe_pending_instances(&wrap->handle_, instances);
162162

163-
return v8::Null();
163+
return v8::Null(node_isolate);
164164
}
165165
#endif
166166

@@ -263,7 +263,7 @@ Handle<Value> PipeWrap::Open(const Arguments& args) {
263263

264264
uv_pipe_open(&wrap->handle_, fd);
265265

266-
return scope.Close(v8::Null());
266+
return scope.Close(v8::Null(node_isolate));
267267
}
268268

269269

‎src/slab_allocator.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ Local<Object> SlabAllocator::Shrink(Handle<Object> obj,
114114
unsigned int size) {
115115
HandleScope scope;
116116
Local<Value> slab_v = obj->GetHiddenValue(slab_sym_);
117-
obj->SetHiddenValue(slab_sym_, Null());
117+
obj->SetHiddenValue(slab_sym_, Null(node_isolate));
118118
assert(!slab_v.IsEmpty());
119119
assert(slab_v->IsObject());
120120
Local<Object> slab = slab_v->ToObject();

‎src/stream_wrap.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ Handle<Value> StreamWrap::WriteBuffer(const Arguments& args) {
264264
uv_err_t err;
265265
err.code = UV_ENOBUFS;
266266
SetErrno(err);
267-
return scope.Close(v8::Null());
267+
return scope.Close(v8::Null(node_isolate));
268268
}
269269

270270
char* storage = new char[sizeof(WriteWrap)];
@@ -291,7 +291,7 @@ Handle<Value> StreamWrap::WriteBuffer(const Arguments& args) {
291291
SetErrno(uv_last_error(uv_default_loop()));
292292
req_wrap->~WriteWrap();
293293
delete[] storage;
294-
return scope.Close(v8::Null());
294+
return scope.Close(v8::Null(node_isolate));
295295
} else {
296296
if (wrap->stream_->type == UV_TCP) {
297297
NODE_COUNT_NET_BYTES_SENT(length);
@@ -354,7 +354,7 @@ Handle<Value> StreamWrap::WriteStringImpl(const Arguments& args) {
354354
uv_err_t err;
355355
err.code = UV_ENOBUFS;
356356
SetErrno(err);
357-
return scope.Close(v8::Null());
357+
return scope.Close(v8::Null(node_isolate));
358358
}
359359

360360
char* storage = new char[sizeof(WriteWrap) + storage_size + 15];
@@ -430,7 +430,7 @@ Handle<Value> StreamWrap::WriteStringImpl(const Arguments& args) {
430430
SetErrno(uv_last_error(uv_default_loop()));
431431
req_wrap->~WriteWrap();
432432
delete[] storage;
433-
return scope.Close(v8::Null());
433+
return scope.Close(v8::Null(node_isolate));
434434
} else {
435435
if (wrap->stream_->type == UV_TCP) {
436436
NODE_COUNT_NET_BYTES_SENT(buf.len);
@@ -501,7 +501,7 @@ Handle<Value> StreamWrap::Shutdown(const Arguments& args) {
501501
if (r) {
502502
SetErrno(uv_last_error(uv_default_loop()));
503503
delete req_wrap;
504-
return scope.Close(v8::Null());
504+
return scope.Close(v8::Null(node_isolate));
505505
} else {
506506
return scope.Close(req_wrap->object_);
507507
}

‎src/tcp_wrap.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ Handle<Value> TCPWrap::GetSockName(const Arguments& args) {
170170

171171
if (r) {
172172
SetErrno(uv_last_error(uv_default_loop()));
173-
return Null();
173+
return Null(node_isolate);
174174
}
175175

176176
const sockaddr* addr = reinterpret_cast<const sockaddr*>(&address);
@@ -191,7 +191,7 @@ Handle<Value> TCPWrap::GetPeerName(const Arguments& args) {
191191

192192
if (r) {
193193
SetErrno(uv_last_error(uv_default_loop()));
194-
return Null();
194+
return Null(node_isolate);
195195
}
196196

197197
const sockaddr* addr = reinterpret_cast<const sockaddr*>(&address);
@@ -325,7 +325,7 @@ void TCPWrap::OnConnection(uv_stream_t* handle, int status) {
325325
argv[0] = client_obj;
326326
} else {
327327
SetErrno(uv_last_error(uv_default_loop()));
328-
argv[0] = Local<Value>::New(node_isolate, Null());
328+
argv[0] = Local<Value>::New(node_isolate, Null(node_isolate));
329329
}
330330

331331
MakeCallback(wrap->object_, onconnection_sym, ARRAY_SIZE(argv), argv);
@@ -383,7 +383,7 @@ Handle<Value> TCPWrap::Connect(const Arguments& args) {
383383
if (r) {
384384
SetErrno(uv_last_error(uv_default_loop()));
385385
delete req_wrap;
386-
return scope.Close(v8::Null());
386+
return scope.Close(v8::Null(node_isolate));
387387
} else {
388388
return scope.Close(req_wrap->object_);
389389
}
@@ -410,7 +410,7 @@ Handle<Value> TCPWrap::Connect6(const Arguments& args) {
410410
if (r) {
411411
SetErrno(uv_last_error(uv_default_loop()));
412412
delete req_wrap;
413-
return scope.Close(v8::Null());
413+
return scope.Close(v8::Null(node_isolate));
414414
} else {
415415
return scope.Close(req_wrap->object_);
416416
}

‎src/udp_wrap.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ Handle<Value> UDPWrap::DoSend(const Arguments& args, int family) {
253253
if (r) {
254254
SetErrno(uv_last_error(uv_default_loop()));
255255
delete req_wrap;
256-
return Null();
256+
return Null(node_isolate);
257257
}
258258
else {
259259
return scope.Close(req_wrap->object_);
@@ -311,7 +311,7 @@ Handle<Value> UDPWrap::GetSockName(const Arguments& args) {
311311

312312
if (r) {
313313
SetErrno(uv_last_error(uv_default_loop()));
314-
return Null();
314+
return Null(node_isolate);
315315
}
316316

317317
const sockaddr* addr = reinterpret_cast<const sockaddr*>(&address);

0 commit comments

Comments
 (0)