Skip to content

Commit e3127b8

Browse files
jasnelltargos
authored andcommitted
src: replace NewFromUtf8 with OneByteString where appropriate
PR-URL: #57096 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Chengzhong Wu <legendecas@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
1 parent 56f9fe7 commit e3127b8

File tree

5 files changed

+13
-26
lines changed

5 files changed

+13
-26
lines changed

src/cares_wrap.cc

+2-4
Original file line numberDiff line numberDiff line change
@@ -1660,11 +1660,9 @@ void CanonicalizeIP(const FunctionCallbackInfo<Value>& args) {
16601660
uv_inet_pton(af = AF_INET6, *ip, result) != 0)
16611661
return;
16621662

1663-
char canonical_ip[INET6_ADDRSTRLEN];
1663+
char canonical_ip[INET6_ADDRSTRLEN]{};
16641664
CHECK_EQ(0, uv_inet_ntop(af, result, canonical_ip, sizeof(canonical_ip)));
1665-
Local<String> val = String::NewFromUtf8(isolate, canonical_ip)
1666-
.ToLocalChecked();
1667-
args.GetReturnValue().Set(val);
1665+
args.GetReturnValue().Set(OneByteString(isolate, canonical_ip));
16681666
}
16691667

16701668
void ConvertIpv6StringToBuffer(const FunctionCallbackInfo<Value>& args) {

src/node_binding.cc

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

686686
Local<Object> module = Object::New(env->isolate());
687687
Local<Object> exports = Object::New(env->isolate());
688-
Local<String> exports_prop =
689-
String::NewFromUtf8Literal(env->isolate(), "exports");
688+
Local<String> exports_prop = env->exports_string();
690689
module->Set(env->context(), exports_prop, exports).Check();
691690

692691
if (mod->nm_context_register_func != nullptr) {

src/node_buffer.cc

+5-12
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ using v8::Just;
7272
using v8::Local;
7373
using v8::Maybe;
7474
using v8::MaybeLocal;
75-
using v8::NewStringType;
7675
using v8::Nothing;
7776
using v8::Number;
7877
using v8::Object;
@@ -1307,12 +1306,9 @@ static void Btoa(const FunctionCallbackInfo<Value>& args) {
13071306
written = simdutf::binary_to_base64(*stack_buf, out_len, buffer.out());
13081307
}
13091308

1310-
auto value =
1311-
String::NewFromOneByte(env->isolate(),
1312-
reinterpret_cast<const uint8_t*>(buffer.out()),
1313-
NewStringType::kNormal,
1314-
written)
1315-
.ToLocalChecked();
1309+
auto value = OneByteString(
1310+
env->isolate(), reinterpret_cast<const uint8_t*>(buffer.out()), written);
1311+
13161312
return args.GetReturnValue().Set(value);
13171313
}
13181314

@@ -1362,12 +1358,9 @@ static void Atob(const FunctionCallbackInfo<Value>& args) {
13621358
}
13631359

13641360
if (result.error == simdutf::error_code::SUCCESS) {
1365-
auto value =
1366-
String::NewFromOneByte(env->isolate(),
1361+
auto value = OneByteString(env->isolate(),
13671362
reinterpret_cast<const uint8_t*>(buffer.out()),
1368-
NewStringType::kNormal,
1369-
result.count)
1370-
.ToLocalChecked();
1363+
result.count);
13711364
return args.GetReturnValue().Set(value);
13721365
}
13731366

src/node_i18n.cc

+1-4
Original file line numberDiff line numberDiff line change
@@ -330,10 +330,7 @@ void ICUErrorName(const FunctionCallbackInfo<Value>& args) {
330330
Environment* env = Environment::GetCurrent(args);
331331
CHECK(args[0]->IsInt32());
332332
UErrorCode status = static_cast<UErrorCode>(args[0].As<Int32>()->Value());
333-
Local<Value> res;
334-
if (String::NewFromUtf8(env->isolate(), u_errorName(status)).ToLocal(&res)) {
335-
args.GetReturnValue().Set(res);
336-
}
333+
args.GetReturnValue().Set(OneByteString(env->isolate(), u_errorName(status)));
337334
}
338335

339336
} // anonymous namespace

src/spawn_sync.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -707,10 +707,10 @@ Local<Object> SyncProcessRunner::BuildResultObject() {
707707
}
708708

709709
if (term_signal_ > 0)
710-
js_result->Set(context, env()->signal_string(),
711-
String::NewFromUtf8(env()->isolate(),
712-
signo_string(term_signal_))
713-
.ToLocalChecked())
710+
js_result
711+
->Set(context,
712+
env()->signal_string(),
713+
OneByteString(env()->isolate(), signo_string(term_signal_)))
714714
.Check();
715715
else
716716
js_result->Set(context, env()->signal_string(),

0 commit comments

Comments
 (0)