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

src: pass node_isolate to Null()

Browse Source
This commit is contained in:
Ben Noordhuis 2013-01-06 23:55:56 +01:00
parent 109f73b2c0
commit c7d7ae1fe2
10 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cares_wrap.cc
View File

@ -685,7 +685,7 @@ static Handle<Value> Query(const Arguments& args) {
if (r) {
SetAresErrno(r);
delete wrap;
return scope.Close(v8::Null());
return scope.Close(v8::Null(node_isolate));
} else {
return scope.Close(object);
}
@ -715,7 +715,7 @@ static Handle<Value> QueryWithFamily(const Arguments& args) {
if (r) {
SetAresErrno(r);
delete wrap;
return scope.Close(v8::Null());
return scope.Close(v8::Null(node_isolate));
} else {
return scope.Close(object);
}
@ -732,7 +732,7 @@ void AfterGetAddrInfo(uv_getaddrinfo_t* req, int status, struct addrinfo* res) {
if (status) {
// Error
SetErrno(uv_last_error(uv_default_loop()));
argv[0] = Local<Value>::New(node_isolate, Null());
argv[0] = Local<Value>::New(node_isolate, Null(node_isolate));
} else {
// Success
struct addrinfo *address;
@ -871,7 +871,7 @@ static Handle<Value> GetAddrInfo(const Arguments& args) {
if (r) {
SetErrno(uv_last_error(uv_default_loop()));
delete req_wrap;
return scope.Close(v8::Null());
return scope.Close(v8::Null(node_isolate));
} else {
return scope.Close(req_wrap->object_);
}

2
src/fs_event_wrap.cc
View File

@ -153,7 +153,7 @@ void FSEventWrap::OnEvent(uv_fs_event_t* handle, const char* filename,
Integer::New(status, node_isolate),
eventStr,
filename ? static_cast<Local<Value> >(String::New(filename))
: Local<Value>::New(node_isolate, v8::Null())
: Local<Value>::New(node_isolate, v8::Null(node_isolate))
};
if (onchange_sym.IsEmpty()) {

2
src/handle_wrap.cc
View File

@ -97,7 +97,7 @@ Handle<Value> HandleWrap::Close(const Arguments& args) {
wrap->handle__ = NULL;
}
return v8::Null();
return v8::Null(node_isolate);
}

12
src/node_crypto.cc
View File

@ -1095,7 +1095,7 @@ int Connection::SelectNextProtoCallback_(SSL *s,
switch (status) {
case OPENSSL_NPN_UNSUPPORTED:
p->selectedNPNProto_ = Persistent<Value>::New(Null());
p->selectedNPNProto_ = Persistent<Value>::New(Null(node_isolate));
break;
case OPENSSL_NPN_NEGOTIATED:
p->selectedNPNProto_ = Persistent<Value>::New(String::New(
@ -1617,7 +1617,7 @@ Handle<Value> Connection::GetSession(const Arguments& args) {
return scope.Close(s);
}
return Null();
return Null(node_isolate);
}
Handle<Value> Connection::SetSession(const Arguments& args) {
@ -1768,7 +1768,7 @@ Handle<Value> Connection::VerifyError(const Arguments& args) {
Connection *ss = Connection::Unwrap(args);
if (ss->ssl_ == NULL) return Null();
if (ss->ssl_ == NULL) return Null(node_isolate);
// XXX Do this check in JS land?
@ -1789,7 +1789,7 @@ Handle<Value> Connection::VerifyError(const Arguments& args) {
switch (x509_verify_error) {
case X509_V_OK:
return Null();
return Null(node_isolate);
case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
s = String::New("UNABLE_TO_GET_ISSUER_CERT");
@ -3898,12 +3898,12 @@ void RandomBytesCheck(RandomBytesRequest* req, Local<Value> argv[2]) {
ERR_error_string_n(req->error_, errmsg, sizeof errmsg);
argv[0] = Exception::Error(String::New(errmsg));
argv[1] = Local<Value>::New(node_isolate, Null());
argv[1] = Local<Value>::New(node_isolate, Null(node_isolate));
}
else {
// avoids the malloc + memcpy
Buffer* buffer = Buffer::New(req->data_, req->size_, RandomBytesFree, NULL);
argv[0] = Local<Value>::New(node_isolate, Null());
argv[0] = Local<Value>::New(node_isolate, Null(node_isolate));
argv[1] = Local<Object>::New(node_isolate, buffer->handle_);
}
}

2
src/node_file.cc
View File

@ -113,7 +113,7 @@ static void After(uv_fs_t *req) {
}
} else {
// error value is empty or null for non-error.
argv[0] = Local<Value>::New(node_isolate, Null());
argv[0] = Local<Value>::New(node_isolate, Null(node_isolate));
// All have at least two args now.
argc = 2;

4
src/pipe_wrap.cc
View File

@ -160,7 +160,7 @@ Handle<Value> PipeWrap::SetPendingInstances(const Arguments& args) {
uv_pipe_pending_instances(&wrap->handle_, instances);
return v8::Null();
return v8::Null(node_isolate);
}
#endif
@ -263,7 +263,7 @@ Handle<Value> PipeWrap::Open(const Arguments& args) {
uv_pipe_open(&wrap->handle_, fd);
return scope.Close(v8::Null());
return scope.Close(v8::Null(node_isolate));
}

2
src/slab_allocator.cc
View File

@ -114,7 +114,7 @@ Local<Object> SlabAllocator::Shrink(Handle<Object> obj,
unsigned int size) {
HandleScope scope;
Local<Value> slab_v = obj->GetHiddenValue(slab_sym_);
obj->SetHiddenValue(slab_sym_, Null());
obj->SetHiddenValue(slab_sym_, Null(node_isolate));
assert(!slab_v.IsEmpty());
assert(slab_v->IsObject());
Local<Object> slab = slab_v->ToObject();

10
src/stream_wrap.cc
View File

@ -264,7 +264,7 @@ Handle<Value> StreamWrap::WriteBuffer(const Arguments& args) {
uv_err_t err;
err.code = UV_ENOBUFS;
SetErrno(err);
return scope.Close(v8::Null());
return scope.Close(v8::Null(node_isolate));
}
char* storage = new char[sizeof(WriteWrap)];
@ -291,7 +291,7 @@ Handle<Value> StreamWrap::WriteBuffer(const Arguments& args) {
SetErrno(uv_last_error(uv_default_loop()));
req_wrap->~WriteWrap();
delete[] storage;
return scope.Close(v8::Null());
return scope.Close(v8::Null(node_isolate));
} else {
if (wrap->stream_->type == UV_TCP) {
NODE_COUNT_NET_BYTES_SENT(length);
@ -354,7 +354,7 @@ Handle<Value> StreamWrap::WriteStringImpl(const Arguments& args) {
uv_err_t err;
err.code = UV_ENOBUFS;
SetErrno(err);
return scope.Close(v8::Null());
return scope.Close(v8::Null(node_isolate));
}
char* storage = new char[sizeof(WriteWrap) + storage_size + 15];
@ -430,7 +430,7 @@ Handle<Value> StreamWrap::WriteStringImpl(const Arguments& args) {
SetErrno(uv_last_error(uv_default_loop()));
req_wrap->~WriteWrap();
delete[] storage;
return scope.Close(v8::Null());
return scope.Close(v8::Null(node_isolate));
} else {
if (wrap->stream_->type == UV_TCP) {
NODE_COUNT_NET_BYTES_SENT(buf.len);
@ -501,7 +501,7 @@ Handle<Value> StreamWrap::Shutdown(const Arguments& args) {
if (r) {
SetErrno(uv_last_error(uv_default_loop()));
delete req_wrap;
return scope.Close(v8::Null());
return scope.Close(v8::Null(node_isolate));
} else {
return scope.Close(req_wrap->object_);
}

10
src/tcp_wrap.cc
View File

@ -170,7 +170,7 @@ Handle<Value> TCPWrap::GetSockName(const Arguments& args) {
if (r) {
SetErrno(uv_last_error(uv_default_loop()));
return Null();
return Null(node_isolate);
}
const sockaddr* addr = reinterpret_cast<const sockaddr*>(&address);
@ -191,7 +191,7 @@ Handle<Value> TCPWrap::GetPeerName(const Arguments& args) {
if (r) {
SetErrno(uv_last_error(uv_default_loop()));
return Null();
return Null(node_isolate);
}
const sockaddr* addr = reinterpret_cast<const sockaddr*>(&address);
@ -325,7 +325,7 @@ void TCPWrap::OnConnection(uv_stream_t* handle, int status) {
argv[0] = client_obj;
} else {
SetErrno(uv_last_error(uv_default_loop()));
argv[0] = Local<Value>::New(node_isolate, Null());
argv[0] = Local<Value>::New(node_isolate, Null(node_isolate));
}
MakeCallback(wrap->object_, onconnection_sym, ARRAY_SIZE(argv), argv);
@ -383,7 +383,7 @@ Handle<Value> TCPWrap::Connect(const Arguments& args) {
if (r) {
SetErrno(uv_last_error(uv_default_loop()));
delete req_wrap;
return scope.Close(v8::Null());
return scope.Close(v8::Null(node_isolate));
} else {
return scope.Close(req_wrap->object_);
}
@ -410,7 +410,7 @@ Handle<Value> TCPWrap::Connect6(const Arguments& args) {
if (r) {
SetErrno(uv_last_error(uv_default_loop()));
delete req_wrap;
return scope.Close(v8::Null());
return scope.Close(v8::Null(node_isolate));
} else {
return scope.Close(req_wrap->object_);
}

4
src/udp_wrap.cc
View File

@ -253,7 +253,7 @@ Handle<Value> UDPWrap::DoSend(const Arguments& args, int family) {
if (r) {
SetErrno(uv_last_error(uv_default_loop()));
delete req_wrap;
return Null();
return Null(node_isolate);
}
else {
return scope.Close(req_wrap->object_);
@ -311,7 +311,7 @@ Handle<Value> UDPWrap::GetSockName(const Arguments& args) {
if (r) {
SetErrno(uv_last_error(uv_default_loop()));
return Null();
return Null(node_isolate);
}
const sockaddr* addr = reinterpret_cast<const sockaddr*>(&address);