Browse Source

src: use persistent strings from node::Environment

Replace a few calls to FIXED_ONE_BYTE_STRING() with their persistent
counterparts from `node::Environment`.  None of the calls are in hot
code paths but why create a new string when one already exists?

PR-URL: https://github.com/nodejs/node/pull/11945
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: Brian White <mscdex@mscdex.net>
v6
Ben Noordhuis 8 years ago
committed by James M Snell
parent
commit
f35e80d9af
  1. 3
      src/node_contextify.cc
  2. 7
      src/node_crypto.cc

3
src/node_contextify.cc

@ -743,8 +743,7 @@ class ContextifyScript : public BaseObject {
return -1; return -1;
} }
Local<String> key = FIXED_ONE_BYTE_STRING(env->isolate(), "timeout"); Local<Value> value = options.As<Object>()->Get(env->timeout_string());
Local<Value> value = options.As<Object>()->Get(key);
if (value->IsUndefined()) { if (value->IsUndefined()) {
return -1; return -1;
} }

7
src/node_crypto.cc

@ -2076,8 +2076,7 @@ void SSLWrap<Base>::VerifyError(const FunctionCallbackInfo<Value>& args) {
Local<String> reason_string = OneByteString(isolate, reason); Local<String> reason_string = OneByteString(isolate, reason);
Local<Value> exception_value = Exception::Error(reason_string); Local<Value> exception_value = Exception::Error(reason_string);
Local<Object> exception_object = exception_value->ToObject(isolate); Local<Object> exception_object = exception_value->ToObject(isolate);
exception_object->Set(FIXED_ONE_BYTE_STRING(isolate, "code"), exception_object->Set(w->env()->code_string(), OneByteString(isolate, code));
OneByteString(isolate, code));
args.GetReturnValue().Set(exception_object); args.GetReturnValue().Set(exception_object);
} }
@ -3276,7 +3275,7 @@ void Connection::SetSNICallback(const FunctionCallbackInfo<Value>& args) {
} }
Local<Object> obj = Object::New(env->isolate()); Local<Object> obj = Object::New(env->isolate());
obj->Set(FIXED_ONE_BYTE_STRING(args.GetIsolate(), "onselect"), args[0]); obj->Set(env->onselect_string(), args[0]);
conn->sniObject_.Reset(args.GetIsolate(), obj); conn->sniObject_.Reset(args.GetIsolate(), obj);
} }
#endif #endif
@ -5605,7 +5604,7 @@ void RandomBytes(const FunctionCallbackInfo<Value>& args) {
RandomBytesRequest* req = new RandomBytesRequest(env, obj, size); RandomBytesRequest* req = new RandomBytesRequest(env, obj, size);
if (args[1]->IsFunction()) { if (args[1]->IsFunction()) {
obj->Set(FIXED_ONE_BYTE_STRING(args.GetIsolate(), "ondone"), args[1]); obj->Set(env->ondone_string(), args[1]);
if (env->in_domain()) if (env->in_domain())
obj->Set(env->domain_string(), env->domain_array()->Get(0)); obj->Set(env->domain_string(), env->domain_array()->Get(0));

Loading…
Cancel
Save