fixup!

nodejs · Jun 14, 2024 · f6d6af0 · f6d6af0
1 parent 0a5713d
commit f6d6af0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/napi-inl.h b/napi-inl.h
@@ -13,6 +13,7 @@
 #include "napi.h"
 
 #include <algorithm>
+#include <cstdarg>
 #include <cstring>
 #if NAPI_HAS_THREADS
 #include <mutex>
@@ -340,11 +341,13 @@ struct AccessorCallbackData {
 };
 
 // Debugging-purpose C++-style variant of sprintf().
-template <typename... Args>
-inline std::string SPrintF(const char* format, Args&&... args) {
+inline std::string StringFormat(const char* format, ...) {
   char buf[256];
-  int ret = snprintf(buf, 256, format, args...);
+  va_list args;
+  va_start(args, format);
+  int ret = vsnprintf(buf, sizeof(buf), format, args);
   NAPI_CHECK(ret >= 0, "SPrintF", "Malformed format");
+  va_end(args);
   return buf;
 }
 

diff --git a/napi.h b/napi.h
@@ -147,17 +147,20 @@ static_assert(sizeof(char16_t) == sizeof(wchar_t),
 #define NAPI_INTERNAL_CHECK(expr, location, ...)                               \
   do {                                                                         \
     if (!(expr)) {                                                             \
-      std::string msg = Napi::details::SPrintF(__VA_ARGS__);                   \
-      Napi::Error::Fatal(location " " #expr, msg.c_str());                     \
+      std::string msg = Napi::details::StringFormat(__VA_ARGS__);              \
+      Napi::Error::Fatal(location, msg.c_str());                               \
     }                                                                          \
   } while (0)
 
 #define NAPI_INTERNAL_CHECK_EQ(actual, expected, value_format, location)       \
-  NAPI_INTERNAL_CHECK((actual) == (expected),                                  \
-                      location,                                                \
-                      "Expected " #actual " to be equal to " #expected         \
-                      ", but got " value_format ".",                           \
-                      actual)
+  do {                                                                         \
+    auto actual_value = (actual);                                              \
+    NAPI_INTERNAL_CHECK(actual_value == (expected),                            \
+                        location,                                              \
+                        "Expected " #actual " to be equal to " #expected       \
+                        ", but got " value_format ".",                         \
+                        actual_value);                                         \
+  } while (0)
 
 #define NAPI_FATAL_IF_FAILED(status, location, message)                        \
   NAPI_CHECK((status) == napi_ok, location, message)