Skip to content

Commit 510b1d0

Browse files
jasnelladuh95
jasnell
authored and
aduh95
committed
src: minor cleanups on OneByteString usage
* Provide a OneByteString variant that accepts std::string_view * Use FIXED_ONE_BYTE_STRING in appropriate places Signed-off-by: James M Snell <[email protected]> PR-URL: #56482 Reviewed-By: Yagiz Nizipli <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Chengzhong Wu <[email protected]> Reviewed-By: Rafael Gonzaga <[email protected]> Reviewed-By: Ethan Arrowood <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>
1 parent cf38e85 commit 510b1d0

18 files changed

+92
-74
lines changed

‎src/crypto/crypto_ec.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -767,16 +767,16 @@ Maybe<void> ExportJWKEcKey(Environment* env,
767767
const int nid = EC_GROUP_get_curve_name(group);
768768
switch (nid) {
769769
case NID_X9_62_prime256v1:
770-
crv_name = OneByteString(env->isolate(), "P-256");
770+
crv_name = FIXED_ONE_BYTE_STRING(env->isolate(), "P-256");
771771
break;
772772
case NID_secp256k1:
773-
crv_name = OneByteString(env->isolate(), "secp256k1");
773+
crv_name = FIXED_ONE_BYTE_STRING(env->isolate(), "secp256k1");
774774
break;
775775
case NID_secp384r1:
776-
crv_name = OneByteString(env->isolate(), "P-384");
776+
crv_name = FIXED_ONE_BYTE_STRING(env->isolate(), "P-384");
777777
break;
778778
case NID_secp521r1:
779-
crv_name = OneByteString(env->isolate(), "P-521");
779+
crv_name = FIXED_ONE_BYTE_STRING(env->isolate(), "P-521");
780780
break;
781781
default: {
782782
THROW_ERR_CRYPTO_JWK_UNSUPPORTED_CURVE(

‎src/crypto/crypto_hash.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ void Hash::GetCachedAliases(const FunctionCallbackInfo<Value>& args) {
152152
names.reserve(size);
153153
values.reserve(size);
154154
for (auto& [alias, id] : env->alias_to_md_id_map) {
155-
names.push_back(OneByteString(isolate, alias.c_str(), alias.size()));
155+
names.push_back(OneByteString(isolate, alias));
156156
values.push_back(v8::Uint32::New(isolate, id));
157157
}
158158
#else

‎src/crypto/crypto_tls.cc‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -859,8 +859,7 @@ void TLSWrap::ClearOut() {
859859
if (context.IsEmpty()) [[unlikely]]
860860
return;
861861
const std::string error_str = GetBIOError();
862-
Local<String> message = OneByteString(
863-
env()->isolate(), error_str.c_str(), error_str.size());
862+
Local<String> message = OneByteString(env()->isolate(), error_str);
864863
if (message.IsEmpty()) [[unlikely]]
865864
return;
866865
error = Exception::Error(message);
@@ -1974,7 +1973,7 @@ void TLSWrap::GetSharedSigalgs(const FunctionCallbackInfo<Value>& args) {
19741973
} else {
19751974
sig_with_md += "UNDEF";
19761975
}
1977-
ret_arr[i] = OneByteString(env->isolate(), sig_with_md.c_str());
1976+
ret_arr[i] = OneByteString(env->isolate(), sig_with_md);
19781977
}
19791978

19801979
args.GetReturnValue().Set(

‎src/histogram.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ Local<FunctionTemplate> IntervalHistogram::GetConstructorTemplate(
339339
Isolate* isolate = env->isolate();
340340
tmpl = NewFunctionTemplate(isolate, nullptr);
341341
tmpl->Inherit(HandleWrap::GetConstructorTemplate(env));
342-
tmpl->SetClassName(OneByteString(isolate, "Histogram"));
342+
tmpl->SetClassName(FIXED_ONE_BYTE_STRING(isolate, "Histogram"));
343343
auto instance = tmpl->InstanceTemplate();
344344
instance->SetInternalFieldCount(HistogramImpl::kInternalFieldCount);
345345
HistogramImpl::AddMethods(isolate, tmpl);

‎src/inspector_js_api.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ void Url(const FunctionCallbackInfo<Value>& args) {
333333
if (url.empty()) {
334334
return;
335335
}
336-
args.GetReturnValue().Set(OneByteString(env->isolate(), url.c_str()));
336+
args.GetReturnValue().Set(OneByteString(env->isolate(), url));
337337
}
338338

339339
void Initialize(Local<Object> target, Local<Value> unused,

‎src/node_builtins.cc‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ void BuiltinLoader::GetNatives(Local<Name> property,
7878
Local<Object> out = Object::New(isolate);
7979
auto source = env->builtin_loader()->source_.read();
8080
for (auto const& x : *source) {
81-
Local<String> key = OneByteString(isolate, x.first.c_str(), x.first.size());
81+
Local<String> key = OneByteString(isolate, x.first);
8282
out->Set(context, key, x.second.ToStringChecked(isolate)).FromJust();
8383
}
8484
info.GetReturnValue().Set(out);
@@ -206,7 +206,7 @@ MaybeLocal<String> BuiltinLoader::LoadBuiltinSource(Isolate* isolate,
206206
uv_err_name(r),
207207
uv_strerror(r),
208208
filename);
209-
Local<String> message = OneByteString(isolate, buf.c_str());
209+
Local<String> message = OneByteString(isolate, buf);
210210
isolate->ThrowException(v8::Exception::Error(message));
211211
return MaybeLocal<String>();
212212
}
@@ -276,8 +276,7 @@ MaybeLocal<Function> BuiltinLoader::LookupAndCompileInternal(
276276
}
277277

278278
std::string filename_s = std::string("node:") + id;
279-
Local<String> filename =
280-
OneByteString(isolate, filename_s.c_str(), filename_s.size());
279+
Local<String> filename = OneByteString(isolate, filename_s);
281280
ScriptOrigin origin(filename, 0, 0, true);
282281

283282
BuiltinCodeCacheData cached_data{};
@@ -594,7 +593,7 @@ void BuiltinLoader::GetBuiltinCategories(
594593
return;
595594
if (result
596595
->Set(context,
597-
OneByteString(isolate, "cannotBeRequired"),
596+
FIXED_ONE_BYTE_STRING(isolate, "cannotBeRequired"),
598597
cannot_be_required_js)
599598
.IsNothing())
600599
return;
@@ -603,7 +602,7 @@ void BuiltinLoader::GetBuiltinCategories(
603602
return;
604603
if (result
605604
->Set(context,
606-
OneByteString(isolate, "canBeRequired"),
605+
FIXED_ONE_BYTE_STRING(isolate, "canBeRequired"),
607606
can_be_required_js)
608607
.IsNothing()) {
609608
return;
@@ -626,7 +625,7 @@ void BuiltinLoader::GetCacheUsage(const FunctionCallbackInfo<Value>& args) {
626625
}
627626
if (result
628627
->Set(context,
629-
OneByteString(isolate, "compiledWithCache"),
628+
FIXED_ONE_BYTE_STRING(isolate, "compiledWithCache"),
630629
builtins_with_cache_js)
631630
.IsNothing()) {
632631
return;
@@ -638,7 +637,7 @@ void BuiltinLoader::GetCacheUsage(const FunctionCallbackInfo<Value>& args) {
638637
}
639638
if (result
640639
->Set(context,
641-
OneByteString(isolate, "compiledWithoutCache"),
640+
FIXED_ONE_BYTE_STRING(isolate, "compiledWithoutCache"),
642641
builtins_without_cache_js)
643642
.IsNothing()) {
644643
return;
@@ -650,7 +649,7 @@ void BuiltinLoader::GetCacheUsage(const FunctionCallbackInfo<Value>& args) {
650649
}
651650
if (result
652651
->Set(context,
653-
OneByteString(isolate, "compiledInSnapshot"),
652+
FIXED_ONE_BYTE_STRING(isolate, "compiledInSnapshot"),
654653
builtins_in_snapshot_js)
655654
.IsNothing()) {
656655
return;

‎src/node_constants.cc‎

Lines changed: 41 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1336,33 +1336,47 @@ void CreatePerContextProperties(Local<Object> target,
13361336
// Define libuv constants.
13371337
NODE_DEFINE_CONSTANT(os_constants, UV_UDP_REUSEADDR);
13381338

1339-
os_constants->Set(env->context(),
1340-
OneByteString(isolate, "dlopen"),
1341-
dlopen_constants).Check();
1342-
os_constants->Set(env->context(),
1343-
OneByteString(isolate, "errno"),
1344-
err_constants).Check();
1345-
os_constants->Set(env->context(),
1346-
OneByteString(isolate, "signals"),
1347-
sig_constants).Check();
1348-
os_constants->Set(env->context(),
1349-
OneByteString(isolate, "priority"),
1350-
priority_constants).Check();
1351-
target->Set(env->context(),
1352-
OneByteString(isolate, "os"),
1353-
os_constants).Check();
1354-
target->Set(env->context(),
1355-
OneByteString(isolate, "fs"),
1356-
fs_constants).Check();
1357-
target->Set(env->context(),
1358-
OneByteString(isolate, "crypto"),
1359-
crypto_constants).Check();
1360-
target->Set(env->context(),
1361-
OneByteString(isolate, "zlib"),
1362-
zlib_constants).Check();
1363-
target->Set(env->context(),
1364-
OneByteString(isolate, "trace"),
1365-
trace_constants).Check();
1339+
os_constants
1340+
->Set(env->context(),
1341+
FIXED_ONE_BYTE_STRING(isolate, "dlopen"),
1342+
dlopen_constants)
1343+
.Check();
1344+
os_constants
1345+
->Set(env->context(),
1346+
FIXED_ONE_BYTE_STRING(isolate, "errno"),
1347+
err_constants)
1348+
.Check();
1349+
os_constants
1350+
->Set(env->context(),
1351+
FIXED_ONE_BYTE_STRING(isolate, "signals"),
1352+
sig_constants)
1353+
.Check();
1354+
os_constants
1355+
->Set(env->context(),
1356+
FIXED_ONE_BYTE_STRING(isolate, "priority"),
1357+
priority_constants)
1358+
.Check();
1359+
target
1360+
->Set(env->context(), FIXED_ONE_BYTE_STRING(isolate, "os"), os_constants)
1361+
.Check();
1362+
target
1363+
->Set(env->context(), FIXED_ONE_BYTE_STRING(isolate, "fs"), fs_constants)
1364+
.Check();
1365+
target
1366+
->Set(env->context(),
1367+
FIXED_ONE_BYTE_STRING(isolate, "crypto"),
1368+
crypto_constants)
1369+
.Check();
1370+
target
1371+
->Set(env->context(),
1372+
FIXED_ONE_BYTE_STRING(isolate, "zlib"),
1373+
zlib_constants)
1374+
.Check();
1375+
target
1376+
->Set(env->context(),
1377+
FIXED_ONE_BYTE_STRING(isolate, "trace"),
1378+
trace_constants)
1379+
.Check();
13661380
}
13671381

13681382
} // namespace constants

‎src/node_errors.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ void OOMErrorHandler(const char* location, const v8::OOMDetails& details);
118118
inline v8::Local<v8::Object> code( \
119119
v8::Isolate* isolate, const char* format, Args&&... args) { \
120120
std::string message = SPrintF(format, std::forward<Args>(args)...); \
121-
v8::Local<v8::String> js_code = OneByteString(isolate, #code); \
121+
v8::Local<v8::String> js_code = FIXED_ONE_BYTE_STRING(isolate, #code); \
122122
v8::Local<v8::String> js_msg = \
123123
v8::String::NewFromUtf8(isolate, \
124124
message.c_str(), \
@@ -129,7 +129,7 @@ void OOMErrorHandler(const char* location, const v8::OOMDetails& details);
129129
->ToObject(isolate->GetCurrentContext()) \
130130
.ToLocalChecked(); \
131131
e->Set(isolate->GetCurrentContext(), \
132-
OneByteString(isolate, "code"), \
132+
FIXED_ONE_BYTE_STRING(isolate, "code"), \
133133
js_code) \
134134
.Check(); \
135135
return e; \

‎src/node_http2.cc‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -725,13 +725,14 @@ MaybeLocal<Object> Http2SessionPerformanceEntryTraits::GetDetails(
725725
SET(stream_average_duration_string, stream_average_duration)
726726
SET(stream_count_string, stream_count)
727727

728-
if (!obj->Set(
729-
env->context(),
730-
env->type_string(),
731-
OneByteString(
732-
env->isolate(),
733-
(entry.details.session_type == NGHTTP2_SESSION_SERVER)
734-
? "server" : "client")).IsJust()) {
728+
if (!obj->Set(env->context(),
729+
env->type_string(),
730+
FIXED_ONE_BYTE_STRING(
731+
env->isolate(),
732+
(entry.details.session_type == NGHTTP2_SESSION_SERVER)
733+
? "server"
734+
: "client"))
735+
.IsJust()) {
735736
return MaybeLocal<Object>();
736737
}
737738

‎src/node_messaging.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1660,7 +1660,7 @@ static void CreatePerIsolateProperties(IsolateData* isolate_data,
16601660
Local<FunctionTemplate> t = FunctionTemplate::New(isolate);
16611661
t->InstanceTemplate()->SetInternalFieldCount(
16621662
JSTransferable::kInternalFieldCount);
1663-
t->SetClassName(OneByteString(isolate, "JSTransferable"));
1663+
t->SetClassName(FIXED_ONE_BYTE_STRING(isolate, "JSTransferable"));
16641664
isolate_data->set_js_transferable_constructor_template(t);
16651665
}
16661666

0 commit comments

Comments
 (0)