Skip to content

Commit 193f315

Browse files
Jayasankar-mBridgeAR
authored andcommitted
src: elevate v8 namespaces for node_process.cc
Elevate namespace for repeated entities. Resolved conflicts. PR-URL: #24578 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent f28fdc9 commit 193f315

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

src/node_process.cc

+7-6
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ using v8::Integer;
5454
using v8::Isolate;
5555
using v8::Local;
5656
using v8::Name;
57+
using v8::NewStringType;
5758
using v8::PropertyCallbackInfo;
5859
using v8::String;
5960
using v8::Uint32;
@@ -135,7 +136,7 @@ void Cwd(const FunctionCallbackInfo<Value>& args) {
135136

136137
Local<String> cwd = String::NewFromUtf8(env->isolate(),
137138
buf,
138-
v8::NewStringType::kNormal,
139+
NewStringType::kNormal,
139140
cwd_len).ToLocalChecked();
140141
args.GetReturnValue().Set(cwd);
141142
}
@@ -591,7 +592,7 @@ void ProcessTitleGetter(Local<Name> property,
591592
char buffer[512];
592593
uv_get_process_title(buffer, sizeof(buffer));
593594
info.GetReturnValue().Set(String::NewFromUtf8(info.GetIsolate(), buffer,
594-
v8::NewStringType::kNormal).ToLocalChecked());
595+
NewStringType::kNormal).ToLocalChecked());
595596
}
596597

597598

@@ -616,7 +617,7 @@ void EnvGetter(Local<Name> property,
616617
const char* val = getenv(*key);
617618
if (val) {
618619
return info.GetReturnValue().Set(String::NewFromUtf8(isolate, val,
619-
v8::NewStringType::kNormal).ToLocalChecked());
620+
NewStringType::kNormal).ToLocalChecked());
620621
}
621622
#else // _WIN32
622623
node::TwoByteValue key(isolate, property);
@@ -632,7 +633,7 @@ void EnvGetter(Local<Name> property,
632633
result < arraysize(buffer)) {
633634
const uint16_t* two_byte_buffer = reinterpret_cast<const uint16_t*>(buffer);
634635
v8::MaybeLocal<String> rc = String::NewFromTwoByte(
635-
isolate, two_byte_buffer, v8::NewStringType::kNormal);
636+
isolate, two_byte_buffer, NewStringType::kNormal);
636637
if (rc.IsEmpty()) {
637638
isolate->ThrowException(ERR_STRING_TOO_LONG(isolate));
638639
return;
@@ -744,7 +745,7 @@ void EnvEnumerator(const PropertyCallbackInfo<Array>& info) {
744745
const char* s = strchr(var, '=');
745746
const int length = s ? s - var : strlen(var);
746747
env_v[i] =
747-
String::NewFromUtf8(isolate, var, v8::NewStringType::kNormal, length)
748+
String::NewFromUtf8(isolate, var, NewStringType::kNormal, length)
748749
.ToLocalChecked();
749750
}
750751
#else // _WIN32
@@ -770,7 +771,7 @@ void EnvEnumerator(const PropertyCallbackInfo<Array>& info) {
770771
v8::MaybeLocal<String> rc =
771772
String::NewFromTwoByte(isolate,
772773
two_byte_buffer,
773-
v8::NewStringType::kNormal,
774+
NewStringType::kNormal,
774775
two_byte_buffer_len);
775776
if (rc.IsEmpty()) {
776777
isolate->ThrowException(ERR_STRING_TOO_LONG(isolate));

0 commit comments

Comments
 (0)