Skip to content

Commit 86e10e9

Browse files
jasnelladuh95
authored andcommitted
src: replace NewFromUtf8 with OneByteString where appropriate
PR-URL: #57096 Reviewed-By: Yagiz Nizipli <[email protected]> Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Chengzhong Wu <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
1 parent 847162b commit 86e10e9

File tree

5 files changed

+13
-25
lines changed

5 files changed

+13
-25
lines changed

src/cares_wrap.cc

Lines changed: 2 additions & 4 deletions
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

Lines changed: 1 addition & 2 deletions
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

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ using v8::Just;
7171
using v8::Local;
7272
using v8::Maybe;
7373
using v8::MaybeLocal;
74-
using v8::NewStringType;
7574
using v8::Nothing;
7675
using v8::Number;
7776
using v8::Object;
@@ -1310,12 +1309,9 @@ static void Btoa(const FunctionCallbackInfo<Value>& args) {
13101309
written = simdutf::binary_to_base64(*stack_buf, out_len, buffer.out());
13111310
}
13121311

1313-
auto value =
1314-
String::NewFromOneByte(env->isolate(),
1315-
reinterpret_cast<const uint8_t*>(buffer.out()),
1316-
NewStringType::kNormal,
1317-
written)
1318-
.ToLocalChecked();
1312+
auto value = OneByteString(
1313+
env->isolate(), reinterpret_cast<const uint8_t*>(buffer.out()), written);
1314+
13191315
return args.GetReturnValue().Set(value);
13201316
}
13211317

@@ -1365,12 +1361,9 @@ static void Atob(const FunctionCallbackInfo<Value>& args) {
13651361
}
13661362

13671363
if (result.error == simdutf::error_code::SUCCESS) {
1368-
auto value =
1369-
String::NewFromOneByte(env->isolate(),
1364+
auto value = OneByteString(env->isolate(),
13701365
reinterpret_cast<const uint8_t*>(buffer.out()),
1371-
NewStringType::kNormal,
1372-
result.count)
1373-
.ToLocalChecked();
1366+
result.count);
13741367
return args.GetReturnValue().Set(value);
13751368
}
13761369

src/node_i18n.cc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -327,9 +327,7 @@ void ICUErrorName(const FunctionCallbackInfo<Value>& args) {
327327
Environment* env = Environment::GetCurrent(args);
328328
CHECK(args[0]->IsInt32());
329329
UErrorCode status = static_cast<UErrorCode>(args[0].As<Int32>()->Value());
330-
args.GetReturnValue().Set(
331-
String::NewFromUtf8(env->isolate(),
332-
u_errorName(status)).ToLocalChecked());
330+
args.GetReturnValue().Set(OneByteString(env->isolate(), u_errorName(status)));
333331
}
334332

335333
} // anonymous namespace

src/spawn_sync.cc

Lines changed: 4 additions & 4 deletions
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)