use struct

Signed-off-by: Gürgün Dayıoğlu <hey@gurgun.day>

Author: gurgunday

src/node_buffer.cc

@@ -1360,10 +1360,16 @@ void FastSwap64(Local<Value> receiver,
 
 static CFunction fast_swap64(CFunction::Make(FastSwap64));
 
-static bool ValidateUtf8(Local<Value> value, bool* was_detached) {
+struct ValidationResult {
+  bool is_valid;
+  bool was_detached;
+};
+
+static ValidationResult ValidateUtf8(Local<Value> value) {
   ArrayBufferViewContents<char> abv(value);
-  *was_detached = abv.WasDetached();
-  return !*was_detached && simdutf::validate_utf8(abv.data(), abv.length());
+  bool was_detached = abv.WasDetached();
+  return { !was_detached && simdutf::validate_utf8(abv.data(), abv.length()),
+           was_detached };
 }
 
 static void IsUtf8(const FunctionCallbackInfo<Value>& args) {
@@ -1372,14 +1378,13 @@ static void IsUtf8(const FunctionCallbackInfo<Value>& args) {
   CHECK(args[0]->IsTypedArray() || args[0]->IsArrayBuffer() ||
         args[0]->IsSharedArrayBuffer());
 
-  bool was_detached;
-  const bool result = ValidateUtf8(args[0], &was_detached);
-  if (was_detached) {
+  const ValidationResult result = ValidateUtf8(args[0]);
+  if (result.was_detached) {
     return node::THROW_ERR_INVALID_STATE(
         env, "Cannot validate on a detached buffer");
   }
 
-  args.GetReturnValue().Set(result);
+  args.GetReturnValue().Set(result.is_valid);
 }
 
 static bool FastIsUtf8(Local<Value> receiver,
@@ -1389,23 +1394,24 @@ static bool FastIsUtf8(Local<Value> receiver,
   TRACK_V8_FAST_API_CALL("buffer.isUtf8");
   HandleScope scope(options.isolate);
 
-  bool was_detached;
-  const bool result = ValidateUtf8(value, &was_detached);
-  if (was_detached) {
+  const ValidationResult result = ValidateUtf8(value);
+  if (result.was_detached) {
     node::THROW_ERR_INVALID_STATE(options.isolate,
                                   "Cannot validate on a detached buffer");
     return false;
   }
-  return result;
+  return result.is_valid;
 }
 
 static CFunction fast_is_utf8(CFunction::Make(FastIsUtf8));
 
-static bool ValidateAscii(Local<Value> value, bool* was_detached) {
+static ValidationResult ValidateAscii(Local<Value> value) {
   ArrayBufferViewContents<char> abv(value);
-  *was_detached = abv.WasDetached();
-  return !*was_detached &&
-         !simdutf::validate_ascii_with_errors(abv.data(), abv.length()).error;
+  bool was_detached = abv.WasDetached();
+  return { !was_detached &&
+               !simdutf::validate_ascii_with_errors(abv.data(), abv.length())
+                    .error,
+           was_detached };
 }
 
 static void IsAscii(const FunctionCallbackInfo<Value>& args) {
@@ -1414,14 +1420,13 @@ static void IsAscii(const FunctionCallbackInfo<Value>& args) {
   CHECK(args[0]->IsTypedArray() || args[0]->IsArrayBuffer() ||
         args[0]->IsSharedArrayBuffer());
 
-  bool was_detached;
-  const bool result = ValidateAscii(args[0], &was_detached);
-  if (was_detached) {
+  const ValidationResult result = ValidateAscii(args[0]);
+  if (result.was_detached) {
     return node::THROW_ERR_INVALID_STATE(
         env, "Cannot validate on a detached buffer");
   }
 
-  args.GetReturnValue().Set(result);
+  args.GetReturnValue().Set(result.is_valid);
 }
 
 static bool FastIsAscii(Local<Value> receiver,
@@ -1431,14 +1436,13 @@ static bool FastIsAscii(Local<Value> receiver,
   TRACK_V8_FAST_API_CALL("buffer.isAscii");
   HandleScope scope(options.isolate);
 
-  bool was_detached;
-  const bool result = ValidateAscii(value, &was_detached);
-  if (was_detached) {
+  const ValidationResult result = ValidateAscii(value);
+  if (result.was_detached) {
     node::THROW_ERR_INVALID_STATE(options.isolate,
                                   "Cannot validate on a detached buffer");
     return false;
   }
-  return result;
+  return result.is_valid;
 }
 
 static CFunction fast_is_ascii(CFunction::Make(FastIsAscii));