fixup

Signed-off-by: Paolo Insogna <[email protected]>

Author: ShogunPanda

doc/api/errors.md

@@ -1332,6 +1332,12 @@ added: v14.0.0
 Used when a feature that is not available
 to the current platform which is running Node.js is used.
 
+<a id="ERR_FFI_CALL_FAILED"></a>
+
+### `ERR_FFI_CALL_FAILED`
+
+A low-level FFI call failed.
+
 <a id="ERR_FFI_INVALID_POINTER"></a>
 
 ### `ERR_FFI_INVALID_POINTER`
@@ -1344,12 +1350,6 @@ An invalid pointer was passed to an FFI operation.
 
 An operation was attempted on an FFI dynamic library after it was closed.
 
-<a id="ERR_FFI_SYSCALL_FAILED"></a>
-
-### `ERR_FFI_SYSCALL_FAILED`
-
-A low-level FFI call failed.
-
 <a id="ERR_FS_CP_DIR_TO_NON_DIR"></a>
 
 ### `ERR_FS_CP_DIR_TO_NON_DIR`

src/ffi/data.cc

@@ -675,7 +675,7 @@ void ExportBytes(const FunctionCallbackInfo<Value>& args) {
     return;
   }
 
-  uint8_t* source_data = nullptr;
+  const uint8_t* source_data = nullptr;
   size_t source_len = 0;
 
   if (args[0]->IsArrayBuffer()) {
@@ -685,15 +685,15 @@ void ExportBytes(const FunctionCallbackInfo<Value>& args) {
       THROW_ERR_INVALID_ARG_VALUE(env, "Invalid ArrayBuffer backing store");
       return;
     }
-    source_data = static_cast<uint8_t*>(store->Data());
+    source_data = static_cast<const uint8_t*>(store->Data());
     source_len = array_buffer->ByteLength();
   } else if (args[0]->IsArrayBufferView()) {
     ArrayBufferViewContents<uint8_t> view(args[0]);
     if (view.WasDetached()) {
       THROW_ERR_INVALID_ARG_VALUE(env, "Invalid ArrayBufferView backing store");
       return;
     }
-    source_data = const_cast<uint8_t*>(view.data());
+    source_data = view.data();
     source_len = view.length();
   } else {
     THROW_ERR_INVALID_ARG_TYPE(

src/node_errors.h

@@ -79,9 +79,9 @@ void OOMErrorHandler(const char* location, const v8::OOMDetails& details);
   V(ERR_DLOPEN_FAILED, Error)                                                  \
   V(ERR_ENCODING_INVALID_ENCODED_DATA, TypeError)                              \
   V(ERR_EXECUTION_ENVIRONMENT_NOT_AVAILABLE, Error)                            \
+  V(ERR_FFI_CALL_FAILED, Error)                                                \
   V(ERR_FFI_INVALID_POINTER, Error)                                            \
   V(ERR_FFI_LIBRARY_CLOSED, Error)                                             \
-  V(ERR_FFI_SYSCALL_FAILED, Error)                                             \
   V(ERR_FS_CP_EINVAL, Error)                                                   \
   V(ERR_FS_CP_DIR_TO_NON_DIR, Error)                                           \
   V(ERR_FS_CP_NON_DIR_TO_DIR, Error)                                           \

src/node_ffi.cc

@@ -99,7 +99,7 @@ bool DynamicLibrary::ResolveSymbol(Environment* env,
   } else {
     if (uv_dlsym(&lib_, name.c_str(), &ptr) != 0) {
       std::string msg = std::string("dlsym failed: ") + uv_dlerror(&lib_);
-      THROW_ERR_FFI_SYSCALL_FAILED(env, msg.c_str());
+      THROW_ERR_FFI_CALL_FAILED(env, msg.c_str());
       return false;
     }
   }
@@ -160,7 +160,7 @@ bool DynamicLibrary::PrepareFunction(Environment* env,
           break;
       }
 
-      THROW_ERR_FFI_SYSCALL_FAILED(env, msg);
+      THROW_ERR_FFI_CALL_FAILED(env, msg);
       return false;
     }
 
@@ -265,7 +265,7 @@ void DynamicLibrary::New(const FunctionCallbackInfo<Value>& args) {
   // Open the library
   if (uv_dlopen(library_path, &lib->lib_) != 0) {
     std::string msg = std::string("dlopen failed: ") + uv_dlerror(&lib->lib_);
-    THROW_ERR_FFI_SYSCALL_FAILED(env, msg.c_str());
+    THROW_ERR_FFI_CALL_FAILED(env, msg.c_str());
     return;
   }
 
@@ -751,7 +751,7 @@ void DynamicLibrary::RegisterCallback(const FunctionCallbackInfo<Value>& args) {
       ffi_closure_alloc(sizeof(ffi_closure), &callback->ptr));
 
   if (callback->closure == nullptr) {
-    THROW_ERR_FFI_SYSCALL_FAILED(env, "ffi_closure_alloc failed");
+    THROW_ERR_FFI_CALL_FAILED(env, "ffi_closure_alloc failed");
     delete callback;
     return;
   }
@@ -776,7 +776,7 @@ void DynamicLibrary::RegisterCallback(const FunctionCallbackInfo<Value>& args) {
         break;
     }
 
-    THROW_ERR_FFI_SYSCALL_FAILED(env, msg);
+    THROW_ERR_FFI_CALL_FAILED(env, msg);
     delete callback;
     return;
   }
@@ -800,7 +800,7 @@ void DynamicLibrary::RegisterCallback(const FunctionCallbackInfo<Value>& args) {
         break;
     }
 
-    THROW_ERR_FFI_SYSCALL_FAILED(env, msg);
+    THROW_ERR_FFI_CALL_FAILED(env, msg);
     delete callback;
     return;
   }