src: remove calls to deprecated v8 functions (BooleanValue)

Remove all calls to deprecated v8 functions (here: Value::BooleanValue) inside the code (src directory only). PR-URL: #22075 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com>
nodejs · Sep 6, 2018 · 684f9e5 · 684f9e5
1 parent cf1a020
commit 684f9e5
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 12 deletions.
diff --git a/lib/internal/crypto/cipher.js b/lib/internal/crypto/cipher.js
@@ -181,7 +181,7 @@ Cipher.prototype.final = function final(outputEncoding) {
 
 
 Cipher.prototype.setAutoPadding = function setAutoPadding(ap) {
-  if (!this._handle.setAutoPadding(ap))
+  if (!this._handle.setAutoPadding(!!ap))
     throw new ERR_CRYPTO_INVALID_STATE('setAutoPadding');
   return this;
 };

diff --git a/lib/internal/readline.js b/lib/internal/readline.js
@@ -36,9 +36,11 @@ if (process.binding('config').hasIntl) {
     options = options || {};
     if (!Number.isInteger(str))
       str = stripVTControlCharacters(String(str));
-    return icu.getStringWidth(str,
-                              Boolean(options.ambiguousAsFullWidth),
-                              Boolean(options.expandEmojiSequence));
+    return icu.getStringWidth(
+      str,
+      Boolean(options.ambiguousAsFullWidth),
+      Boolean(options.expandEmojiSequence)
+    );
   };
   isFullWidthCodePoint =
     function isFullWidthCodePoint(code, options) {

diff --git a/lib/net.js b/lib/net.js
@@ -1723,7 +1723,7 @@ if (process.platform === 'win32') {
     }
 
     if (handle._simultaneousAccepts !== simultaneousAccepts) {
-      handle.setSimultaneousAccepts(simultaneousAccepts);
+      handle.setSimultaneousAccepts(!!simultaneousAccepts);
       handle._simultaneousAccepts = simultaneousAccepts;
     }
   };

diff --git a/src/node_crypto.cc b/src/node_crypto.cc
@@ -3096,7 +3096,7 @@ void CipherBase::SetAutoPadding(const FunctionCallbackInfo<Value>& args) {
   CipherBase* cipher;
   ASSIGN_OR_RETURN_UNWRAP(&cipher, args.Holder());
 
-  bool b = cipher->SetAutoPadding(args.Length() < 1 || args[0]->BooleanValue());
+  bool b = cipher->SetAutoPadding(args.Length() < 1 || args[0]->IsTrue());
   args.GetReturnValue().Set(b);  // Possibly report invalid state failure
 }
 
@@ -5190,7 +5190,8 @@ void SetFipsCrypto(const FunctionCallbackInfo<Value>& args) {
   CHECK(!force_fips_crypto);
   Environment* env = Environment::GetCurrent(args);
   const bool enabled = FIPS_mode();
-  const bool enable = args[0]->BooleanValue();
+  bool enable;
+  if (!args[0]->BooleanValue(env->context()).To(&enable)) return;
   if (enable == enabled)
     return;  // No action needed.
   if (!FIPS_mode_set(enable)) {

diff --git a/src/node_file.cc b/src/node_file.cc
@@ -1316,7 +1316,7 @@ static void ReadDir(const FunctionCallbackInfo<Value>& args) {
 
   const enum encoding encoding = ParseEncoding(env->isolate(), args[1], UTF8);
 
-  bool with_types = args[2]->BooleanValue();
+  bool with_types = args[2]->IsTrue();
 
   FSReqBase* req_wrap_async = GetReqWrap(env, args[3]);
   if (req_wrap_async != nullptr) {  // readdir(path, encoding, withTypes, req)

diff --git a/src/node_i18n.cc b/src/node_i18n.cc
@@ -815,8 +815,8 @@ static void GetStringWidth(const FunctionCallbackInfo<Value>& args) {
   if (args.Length() < 1)
     return;
 
-  bool ambiguous_as_full_width = args[1]->BooleanValue();
-  bool expand_emoji_sequence = args[2]->BooleanValue();
+  bool ambiguous_as_full_width = args[1]->IsTrue();
+  bool expand_emoji_sequence = args[2]->IsTrue();
 
   if (args[0]->IsNumber()) {
     args.GetReturnValue().Set(

diff --git a/src/tcp_wrap.cc b/src/tcp_wrap.cc
@@ -168,7 +168,7 @@ void TCPWrap::SetNoDelay(const FunctionCallbackInfo<Value>& args) {
   ASSIGN_OR_RETURN_UNWRAP(&wrap,
                           args.Holder(),
                           args.GetReturnValue().Set(UV_EBADF));
-  int enable = static_cast<int>(args[0]->BooleanValue());
+  int enable = static_cast<int>(args[0]->IsTrue());
   int err = uv_tcp_nodelay(&wrap->handle_, enable);
   args.GetReturnValue().Set(err);
 }
@@ -192,7 +192,7 @@ void TCPWrap::SetSimultaneousAccepts(const FunctionCallbackInfo<Value>& args) {
   ASSIGN_OR_RETURN_UNWRAP(&wrap,
                           args.Holder(),
                           args.GetReturnValue().Set(UV_EBADF));
-  bool enable = args[0]->BooleanValue();
+  bool enable = args[0]->IsTrue();
   int err = uv_tcp_simultaneous_accepts(&wrap->handle_, enable);
   args.GetReturnValue().Set(err);
 }