Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace v8::String::Utf8Value with Nan::Utf8String #217

Merged
merged 1 commit into from Jun 12, 2019
Merged

Replace v8::String::Utf8Value with Nan::Utf8String #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/demangle.cpp
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ namespace {
Handle<Value>
demangle(Arguments const& info) {
Nan::HandleScope scope;
String::Utf8Value str(info[0]->ToString());
Nan::Utf8String str(info[0]->ToString());
#ifdef __GNUC__
int status;
char * ret = abi::__cxa_demangle(*str, NULL, NULL, & status);
Expand Down
4 changes: 2 additions & 2 deletions src/dns_service_browse.cpp
View file
Open in desktop
Expand Up @@ -65,7 +65,7 @@ NAN_METHOD(DNSServiceBrowse) {
if ( ! info[3]->IsString()) {
return throwTypeError("argument 4 must be a string (service type)");
}
String::Utf8Value serviceType(info[3]->ToString());
Nan::Utf8String serviceType(info[3]->ToString());

bool has_domain = false;
if ( ! info[4]->IsNull() && ! info[4]->IsUndefined()) {
Expand All @@ -74,7 +74,7 @@ NAN_METHOD(DNSServiceBrowse) {
}
has_domain = true;
}
String::Utf8Value domain(info[4]);
Nan::Utf8String domain(info[4]);

if ( ! info[5]->IsFunction()) {
return throwTypeError("argument 6 must be a function (callBack)");
Expand Down
2 changes: 1 addition & 1 deletion src/dns_service_get_addr_info.cpp
View file
Open in desktop
Expand Up @@ -100,7 +100,7 @@ NAN_METHOD(DNSServiceGetAddrInfo) {
if ( ! info[4]->IsString()) {
return throwTypeError("argument 5 must be a string (hostname)");
}
String::Utf8Value hostname(info[4]->ToString());
Nan::Utf8String hostname(info[4]->ToString());

if ( ! info[5]->IsFunction()) {
return throwTypeError("argument 6 must be a function (callBack)");
Expand Down
8 changes: 4 additions & 4 deletions src/dns_service_register.cpp
View file
Open in desktop
Expand Up @@ -79,12 +79,12 @@ NAN_METHOD(DNSServiceRegister) {
}
has_name = true;
}
String::Utf8Value name(info[3]);
Nan::Utf8String name(info[3]);

if ( ! info[4]->IsString()) {
return throwTypeError("argument 5 must be a string (service type)");
}
String::Utf8Value serviceType(info[4]->ToString());
Nan::Utf8String serviceType(info[4]->ToString());

bool has_domain = false;
if ( ! info[5]->IsNull() && ! info[5]->IsUndefined()) {
Expand All @@ -93,7 +93,7 @@ NAN_METHOD(DNSServiceRegister) {
}
has_domain = true;
}
String::Utf8Value domain(info[5]);
Nan::Utf8String domain(info[5]);

bool has_host = false;
if ( ! info[6]->IsNull() && ! info[6]->IsUndefined()) {
Expand All @@ -102,7 +102,7 @@ NAN_METHOD(DNSServiceRegister) {
}
has_host = true;
}
String::Utf8Value host(info[6]);
Nan::Utf8String host(info[6]);

if ( ! info[7]->IsInt32()) {
return throwTypeError("argument 8 must be an integer (port)");
Expand Down
6 changes: 3 additions & 3 deletions src/dns_service_resolve.cpp
View file
Open in desktop
Expand Up @@ -78,17 +78,17 @@ NAN_METHOD(DNSServiceResolve) {
if ( ! info[3]->IsString()) {
return throwTypeError("argument 4 must be a string (name)");
}
String::Utf8Value name(info[3]->ToString());
Nan::Utf8String name(info[3]->ToString());

if ( ! info[4]->IsString()) {
return throwTypeError("argument 5 must be a string (service type)");
}
String::Utf8Value serviceType(info[4]->ToString());
Nan::Utf8String serviceType(info[4]->ToString());

if ( ! info[5]->IsString()) {
return throwTypeError("argument 6 must be a string (domain)");
}
String::Utf8Value domain(info[5]->ToString());
Nan::Utf8String domain(info[5]->ToString());

if ( ! info[6]->IsFunction()) {
return throwTypeError("argument 7 must be a function (callBack)");
Expand Down
2 changes: 1 addition & 1 deletion src/network_interface.cpp
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@ NAN_METHOD(if_nametoindex) {
if ( ! info[0]->IsString()) {
return throwTypeError("argument 1 must be a string (interface name)");
}
String::Utf8Value interfaceName(info[0]->ToString());
Nan::Utf8String interfaceName(info[0]->ToString());

#ifdef WIN32
DWORD aliasLength = MultiByteToWideChar(CP_UTF8, 0, *interfaceName, -1,
Expand Down
4 changes: 2 additions & 2 deletions src/txt_record_set_value.cpp
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@ NAN_METHOD(TXTRecordSetValue) {
if ( ! info[1]->IsString()) {
return throwTypeError("argument 1 must be a string (key)");
}
String::Utf8Value key(info[1]);
Nan::Utf8String key(info[1]);

if ( ! (info[2]->IsNull() || info[2]->IsUndefined() ||
Buffer::HasInstance(info[2]) || info[2]->IsString())) {
Expand All @@ -41,7 +41,7 @@ NAN_METHOD(TXTRecordSetValue) {
DNSServiceErrorType code = TXTRecordSetValue( & ref->GetTxtRecordRef(), *key,
length(info[2]),
((info[2]->IsNull()||info[2]->IsUndefined())
? NULL : info[2]->IsString() ? *String::Utf8Value(info[2]->ToString()) : Buffer::Data(info[2]->ToObject())));
? NULL : info[2]->IsString() ? *Nan::Utf8String(info[2]->ToString()) : Buffer::Data(info[2]->ToObject())));

if (code != kDNSServiceErr_NoError) {
return throwMdnsError(code);
Expand Down