src: use v8::Boolean(b) over b ? True() : False()

Simplify existing code by using v8::Boolean::New() instead of equivalent expressions that contain ternary operators. PR-URL: #47554 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Mohammed Keyvanzadeh <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Darshan Sen <[email protected]>
nodejs · Jul 6, 2023 · c537fb8 · c537fb8
1 parent ed22f54
commit c537fb8
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 33 deletions.
diff --git a/src/api/environment.cc b/src/api/environment.cc
@@ -20,6 +20,7 @@
 namespace node {
 using errors::TryCatchScope;
 using v8::Array;
+using v8::Boolean;
 using v8::Context;
 using v8::EscapableHandleScope;
 using v8::Function;
@@ -602,7 +603,7 @@ Maybe<bool> InitializeContextRuntime(Local<Context> context) {
   context->AllowCodeGenerationFromStrings(false);
   context->SetEmbedderData(
       ContextEmbedderIndex::kAllowCodeGenerationFromStrings,
-      is_code_generation_from_strings_allowed ? True(isolate) : False(isolate));
+      Boolean::New(isolate, is_code_generation_from_strings_allowed));
 
   if (per_process::cli_options->disable_proto == "") {
     return Just(true);

diff --git a/src/crypto/crypto_context.cc b/src/crypto/crypto_context.cc
@@ -22,6 +22,7 @@ namespace node {
 
 using v8::Array;
 using v8::ArrayBufferView;
+using v8::Boolean;
 using v8::Context;
 using v8::DontDelete;
 using v8::Exception;
@@ -1192,7 +1193,7 @@ int SecureContext::TicketKeyCallback(SSL* ssl,
     return -1;
   }
 
-  argv[2] = enc != 0 ? v8::True(env->isolate()) : v8::False(env->isolate());
+  argv[2] = Boolean::New(env->isolate(), enc != 0);
 
   Local<Value> ret;
   if (!node::MakeCallback(

diff --git a/src/crypto/crypto_hmac.cc b/src/crypto/crypto_hmac.cc
@@ -13,6 +13,7 @@
 
 namespace node {
 
+using v8::Boolean;
 using v8::FunctionCallbackInfo;
 using v8::FunctionTemplate;
 using v8::HandleScope;
@@ -266,11 +267,10 @@ Maybe<bool> HmacTraits::EncodeOutput(
       *result = out->ToArrayBuffer(env);
       break;
     case SignConfiguration::kVerify:
-      *result =
+      *result = Boolean::New(
+          env->isolate(),
           out->size() > 0 && out->size() == params.signature.size() &&
-                  memcmp(out->data(), params.signature.data(), out->size()) == 0
-              ? v8::True(env->isolate())
-              : v8::False(env->isolate());
+              memcmp(out->data(), params.signature.data(), out->size()) == 0);
       break;
     default:
       UNREACHABLE();

diff --git a/src/crypto/crypto_random.cc b/src/crypto/crypto_random.cc
@@ -13,15 +13,14 @@ namespace node {
 
 using v8::ArrayBuffer;
 using v8::BackingStore;
-using v8::False;
+using v8::Boolean;
 using v8::FunctionCallbackInfo;
 using v8::Int32;
 using v8::Just;
 using v8::Local;
 using v8::Maybe;
 using v8::Nothing;
 using v8::Object;
-using v8::True;
 using v8::Uint32;
 using v8::Value;
 
@@ -225,7 +224,7 @@ Maybe<bool> CheckPrimeTraits::EncodeOutput(
     const CheckPrimeConfig& params,
     ByteSource* out,
     v8::Local<v8::Value>* result) {
-  *result = out->data<char>()[0] ? True(env->isolate()) : False(env->isolate());
+  *result = Boolean::New(env->isolate(), out->data<char>()[0] != 0);
   return Just(true);
 }
 

diff --git a/src/crypto/crypto_sig.cc b/src/crypto/crypto_sig.cc
@@ -13,6 +13,7 @@ namespace node {
 
 using v8::ArrayBuffer;
 using v8::BackingStore;
+using v8::Boolean;
 using v8::FunctionCallbackInfo;
 using v8::FunctionTemplate;
 using v8::HandleScope;
@@ -820,8 +821,7 @@ Maybe<bool> SignTraits::EncodeOutput(
       *result = out->ToArrayBuffer(env);
       break;
     case SignConfiguration::kVerify:
-      *result = out->data<char>()[0] == 1 ? v8::True(env->isolate())
-                                          : v8::False(env->isolate());
+      *result = Boolean::New(env->isolate(), out->data<char>()[0] == 1);
       break;
     default:
       UNREACHABLE();

diff --git a/src/crypto/crypto_tls.cc b/src/crypto/crypto_tls.cc
@@ -39,6 +39,7 @@ using v8::Array;
 using v8::ArrayBuffer;
 using v8::ArrayBufferView;
 using v8::BackingStore;
+using v8::Boolean;
 using v8::Context;
 using v8::DontDelete;
 using v8::Exception;
@@ -57,7 +58,6 @@ using v8::PropertyAttribute;
 using v8::ReadOnly;
 using v8::Signature;
 using v8::String;
-using v8::True;
 using v8::Uint32;
 using v8::Value;
 
@@ -96,15 +96,14 @@ void OnClientHello(
 
   if ((buf.IsEmpty() ||
        hello_obj->Set(env->context(), env->session_id_string(), buf)
-          .IsNothing()) ||
+           .IsNothing()) ||
       hello_obj->Set(env->context(), env->servername_string(), servername)
           .IsNothing() ||
-      hello_obj->Set(
-          env->context(),
-          env->tls_ticket_string(),
-          hello.has_ticket()
-              ? True(env->isolate())
-              : False(env->isolate())).IsNothing()) {
+      hello_obj
+          ->Set(env->context(),
+                env->tls_ticket_string(),
+                Boolean::New(env->isolate(), hello.has_ticket()))
+          .IsNothing()) {
     return;
   }
 
@@ -202,9 +201,8 @@ int SSLCertCallback(SSL* s, void* arg) {
       ? String::Empty(env->isolate())
       : OneByteString(env->isolate(), servername, strlen(servername));
 
-  Local<Value> ocsp = (SSL_get_tlsext_status_type(s) == TLSEXT_STATUSTYPE_ocsp)
-      ? True(env->isolate())
-      : False(env->isolate());
+  Local<Value> ocsp = Boolean::New(
+      env->isolate(), SSL_get_tlsext_status_type(s) == TLSEXT_STATUSTYPE_ocsp);
 
   if (info->Set(env->context(), env->servername_string(), servername_str)
           .IsNothing() ||

diff --git a/src/node_http2.cc b/src/node_http2.cc
@@ -28,7 +28,6 @@ using v8::BackingStore;
 using v8::Boolean;
 using v8::Context;
 using v8::EscapableHandleScope;
-using v8::False;
 using v8::Function;
 using v8::FunctionCallbackInfo;
 using v8::FunctionTemplate;
@@ -42,7 +41,6 @@ using v8::Number;
 using v8::Object;
 using v8::ObjectTemplate;
 using v8::String;
-using v8::True;
 using v8::Uint8Array;
 using v8::Undefined;
 using v8::Value;
@@ -332,10 +330,8 @@ void Http2Settings::Done(bool ack) {
   uint64_t end = uv_hrtime();
   double duration = (end - startTime_) / 1e6;
 
-  Local<Value> argv[] = {
-    ack ? True(env()->isolate()) : False(env()->isolate()),
-    Number::New(env()->isolate(), duration)
-  };
+  Local<Value> argv[] = {Boolean::New(env()->isolate(), ack),
+                         Number::New(env()->isolate(), duration)};
   MakeCallback(callback(), arraysize(argv), argv);
 }
 
@@ -3131,10 +3127,7 @@ void Http2Ping::Done(bool ack, const uint8_t* payload) {
   }
 
   Local<Value> argv[] = {
-    ack ? True(isolate) : False(isolate),
-    Number::New(isolate, duration_ms),
-    buf
-  };
+      Boolean::New(isolate, ack), Number::New(isolate, duration_ms), buf};
   MakeCallback(callback(), arraysize(argv), argv);
 }
 

diff --git a/src/node_os.cc b/src/node_os.cc
@@ -234,7 +234,7 @@ static void GetInterfaceAddresses(const FunctionCallbackInfo<Value>& args) {
     result.emplace_back(family);
     result.emplace_back(FIXED_ONE_BYTE_STRING(isolate, mac));
     result.emplace_back(
-        interfaces[i].is_internal ? True(isolate) : False(isolate));
+        Boolean::New(env->isolate(), interfaces[i].is_internal));
     if (interfaces[i].address.address4.sin_family == AF_INET6) {
       uint32_t scopeid = interfaces[i].address.address6.sin6_scope_id;
       result.emplace_back(Integer::NewFromUnsigned(isolate, scopeid));