summaryrefslogtreecommitdiff
path: root/src/tcp_wrap.cc
diff options
context:
space:
mode:
authorDaniel Bevenius <daniel.bevenius@gmail.com>2018-11-08 07:22:13 +0100
committerDaniel Bevenius <daniel.bevenius@gmail.com>2018-11-11 08:02:30 +0100
commit344d33eef110486bc094ba8d97a483379bf62752 (patch)
tree9d929c9fc5a77665f6a5b13defc2b9e0c8c19af3 /src/tcp_wrap.cc
parent19e5e78e9c65605eba43b8c506a8069f6f6d5ff9 (diff)
downloadandroid-node-v8-344d33eef110486bc094ba8d97a483379bf62752.tar.gz
android-node-v8-344d33eef110486bc094ba8d97a483379bf62752.tar.bz2
android-node-v8-344d33eef110486bc094ba8d97a483379bf62752.zip
src: fix v8 compiler warnings in src
This commit changes the code to use the maybe version. PR-URL: https://github.com/nodejs/node/pull/24246 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Refael Ackermann <refack@gmail.com>
Diffstat (limited to 'src/tcp_wrap.cc')
-rw-r--r--src/tcp_wrap.cc36
1 files changed, 27 insertions, 9 deletions
diff --git a/src/tcp_wrap.cc b/src/tcp_wrap.cc
index d462eff15d..e1316b42cd 100644
--- a/src/tcp_wrap.cc
+++ b/src/tcp_wrap.cc
@@ -107,7 +107,9 @@ void TCPWrap::Initialize(Local<Object> target,
env->SetProtoMethod(t, "setSimultaneousAccepts", SetSimultaneousAccepts);
#endif
- target->Set(tcpString, t->GetFunction(env->context()).ToLocalChecked());
+ target->Set(env->context(),
+ tcpString,
+ t->GetFunction(env->context()).ToLocalChecked()).FromJust();
env->set_tcp_constructor_template(t);
// Create FunctionTemplate for TCPConnectWrap.
@@ -117,7 +119,9 @@ void TCPWrap::Initialize(Local<Object> target,
Local<String> wrapString =
FIXED_ONE_BYTE_STRING(env->isolate(), "TCPConnectWrap");
cwt->SetClassName(wrapString);
- target->Set(wrapString, cwt->GetFunction(env->context()).ToLocalChecked());
+ target->Set(env->context(),
+ wrapString,
+ cwt->GetFunction(env->context()).ToLocalChecked()).FromJust();
// Define constants
Local<Object> constants = Object::New(env->isolate());
@@ -349,22 +353,36 @@ Local<Object> AddressToJS(Environment* env,
a6 = reinterpret_cast<const sockaddr_in6*>(addr);
uv_inet_ntop(AF_INET6, &a6->sin6_addr, ip, sizeof ip);
port = ntohs(a6->sin6_port);
- info->Set(env->address_string(), OneByteString(env->isolate(), ip));
- info->Set(env->family_string(), env->ipv6_string());
- info->Set(env->port_string(), Integer::New(env->isolate(), port));
+ info->Set(env->context(),
+ env->address_string(),
+ OneByteString(env->isolate(), ip)).FromJust();
+ info->Set(env->context(),
+ env->family_string(),
+ env->ipv6_string()).FromJust();
+ info->Set(env->context(),
+ env->port_string(),
+ Integer::New(env->isolate(), port)).FromJust();
break;
case AF_INET:
a4 = reinterpret_cast<const sockaddr_in*>(addr);
uv_inet_ntop(AF_INET, &a4->sin_addr, ip, sizeof ip);
port = ntohs(a4->sin_port);
- info->Set(env->address_string(), OneByteString(env->isolate(), ip));
- info->Set(env->family_string(), env->ipv4_string());
- info->Set(env->port_string(), Integer::New(env->isolate(), port));
+ info->Set(env->context(),
+ env->address_string(),
+ OneByteString(env->isolate(), ip)).FromJust();
+ info->Set(env->context(),
+ env->family_string(),
+ env->ipv4_string()).FromJust();
+ info->Set(env->context(),
+ env->port_string(),
+ Integer::New(env->isolate(), port)).FromJust();
break;
default:
- info->Set(env->address_string(), String::Empty(env->isolate()));
+ info->Set(env->context(),
+ env->address_string(),
+ String::Empty(env->isolate())).FromJust();
}
return scope.Escape(info);