src: use SPrintF in ProcessEmitWarning

PR-URL: #38758 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Backport-PR-URL: #39419
nodejs · Jul 20, 2021 · e7f266e · e7f266e
1 parent bb9a9ad
commit e7f266e
Show file tree

Hide file tree

Showing 21 changed files with 49 additions and 32 deletions.
diff --git a/node.gyp b/node.gyp
@@ -714,6 +714,7 @@
         'src/node_perf_common.h',
         'src/node_platform.h',
         'src/node_process.h',
+        'src/node_process-inl.h',
         'src/node_report.h',
         'src/node_revert.h',
         'src/node_root_certs.h',

diff --git a/src/api/hooks.cc b/src/api/hooks.cc
@@ -1,6 +1,6 @@
 #include "env-inl.h"
 #include "node_internals.h"
-#include "node_process.h"
+#include "node_process-inl.h"
 #include "async_wrap.h"
 
 namespace node {

diff --git a/src/env.cc b/src/env.cc
@@ -9,7 +9,7 @@
 #include "node_errors.h"
 #include "node_internals.h"
 #include "node_options-inl.h"
-#include "node_process.h"
+#include "node_process-inl.h"
 #include "node_v8_platform-inl.h"
 #include "node_worker.h"
 #include "req_wrap-inl.h"

diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc
@@ -12,7 +12,7 @@
 #include "node_errors.h"
 #include "node_internals.h"
 #include "node_options-inl.h"
-#include "node_process.h"
+#include "node_process-inl.h"
 #include "node_url.h"
 #include "util-inl.h"
 #include "timer_wrap.h"

diff --git a/src/module_wrap.cc b/src/module_wrap.cc
@@ -5,7 +5,7 @@
 #include "node_contextify.h"
 #include "node_errors.h"
 #include "node_internals.h"
-#include "node_process.h"
+#include "node_process-inl.h"
 #include "node_url.h"
 #include "node_watchdog.h"
 #include "util-inl.h"

diff --git a/src/node.cc b/src/node.cc
@@ -34,7 +34,7 @@
 #include "node_native_module_env.h"
 #include "node_options-inl.h"
 #include "node_perf.h"
-#include "node_process.h"
+#include "node_process-inl.h"
 #include "node_report.h"
 #include "node_revert.h"
 #include "node_v8_platform-inl.h"

diff --git a/src/node_crypto.cc b/src/node_crypto.cc
@@ -27,7 +27,7 @@
 #include "node_crypto_groups.h"
 #include "node_errors.h"
 #include "node_mutex.h"
-#include "node_process.h"
+#include "node_process-inl.h"
 #include "allocated_buffer-inl.h"
 #include "tls_wrap.h"  // TLSWrap
 

diff --git a/src/node_dir.cc b/src/node_dir.cc
@@ -1,6 +1,6 @@
 #include "node_dir.h"
 #include "node_file-inl.h"
-#include "node_process.h"
+#include "node_process-inl.h"
 #include "memory_tracker-inl.h"
 #include "util.h"
 

diff --git a/src/node_env_var.cc b/src/node_env_var.cc
@@ -1,7 +1,7 @@
 #include "debug_utils-inl.h"
 #include "env-inl.h"
 #include "node_errors.h"
-#include "node_process.h"
+#include "node_process-inl.h"
 
 #include <time.h>  // tzset(), _tzset()
 

diff --git a/src/node_errors.cc b/src/node_errors.cc
@@ -5,7 +5,7 @@
 #include "node_errors.h"
 #include "node_internals.h"
 #include "node_report.h"
-#include "node_process.h"
+#include "node_process-inl.h"
 #include "node_v8_platform-inl.h"
 #include "util-inl.h"
 

diff --git a/src/node_file.cc b/src/node_file.cc
@@ -23,7 +23,7 @@
 #include "aliased_buffer.h"
 #include "memory_tracker-inl.h"
 #include "node_buffer.h"
-#include "node_process.h"
+#include "node_process-inl.h"
 #include "node_stat_watcher.h"
 #include "util-inl.h"
 

diff --git a/src/node_messaging.cc b/src/node_messaging.cc
@@ -6,7 +6,7 @@
 #include "node_contextify.h"
 #include "node_buffer.h"
 #include "node_errors.h"
-#include "node_process.h"
+#include "node_process-inl.h"
 #include "util-inl.h"
 
 using node::contextify::ContextifyContext;

diff --git a/src/node_perf.cc b/src/node_perf.cc
@@ -3,7 +3,7 @@
 #include "node_internals.h"
 #include "node_perf.h"
 #include "node_buffer.h"
-#include "node_process.h"
+#include "node_process-inl.h"
 #include "util-inl.h"
 
 #include <cinttypes>

diff --git a/src/node_process-inl.h b/src/node_process-inl.h
@@ -0,0 +1,26 @@
+#ifndef SRC_NODE_PROCESS_INL_H_
+#define SRC_NODE_PROCESS_INL_H_
+
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
+#include "node_process.h"
+#include "v8.h"
+#include "debug_utils-inl.h"
+
+namespace node {
+
+// Call process.emitWarning(str), fmt is a snprintf() format string
+template <typename... Args>
+inline v8::Maybe<bool> ProcessEmitWarning(Environment* env,
+                                          const char* fmt,
+                                          Args&&... args) {
+  std::string warning = SPrintF(fmt, std::forward<Args>(args)...);
+
+  return ProcessEmitWarningGeneric(env, warning.c_str());
+}
+
+}  // namespace node
+
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
+#endif  // SRC_NODE_PROCESS_INL_H_
diff --git a/src/node_process.h b/src/node_process.h
@@ -25,7 +25,10 @@ v8::Maybe<bool> ProcessEmitWarningGeneric(Environment* env,
                                           const char* type = nullptr,
                                           const char* code = nullptr);
 
-v8::Maybe<bool> ProcessEmitWarning(Environment* env, const char* fmt, ...);
+template <typename... Args>
+inline v8::Maybe<bool> ProcessEmitWarning(Environment* env,
+                                          const char* fmt,
+                                          Args&&... args);
 v8::Maybe<bool> ProcessEmitExperimentalWarning(Environment* env,
                                               const char* warning);
 v8::Maybe<bool> ProcessEmitDeprecationWarning(Environment* env,

diff --git a/src/node_process_events.cc b/src/node_process_events.cc
@@ -1,8 +1,7 @@
-#include <cstdarg>
 #include <set>
 
 #include "env-inl.h"
-#include "node_process.h"
+#include "node_process-inl.h"
 #include "util.h"
 
 namespace node {
@@ -84,18 +83,6 @@ Maybe<bool> ProcessEmitWarningGeneric(Environment* env,
   return Just(true);
 }
 
-// Call process.emitWarning(str), fmt is a snprintf() format string
-Maybe<bool> ProcessEmitWarning(Environment* env, const char* fmt, ...) {
-  char warning[1024];
-  va_list ap;
-
-  va_start(ap, fmt);
-  vsnprintf(warning, sizeof(warning), fmt, ap);
-  va_end(ap);
-
-  return ProcessEmitWarningGeneric(env, warning);
-}
-
 
 std::set<std::string> experimental_warnings;
 

diff --git a/src/node_process_methods.cc b/src/node_process_methods.cc
@@ -4,7 +4,7 @@
 #include "node.h"
 #include "node_errors.h"
 #include "node_internals.h"
-#include "node_process.h"
+#include "node_process-inl.h"
 #include "util-inl.h"
 #include "uv.h"
 #include "v8.h"

diff --git a/src/node_process_object.cc b/src/node_process_object.cc
@@ -2,7 +2,7 @@
 #include "node_internals.h"
 #include "node_options-inl.h"
 #include "node_metadata.h"
-#include "node_process.h"
+#include "node_process-inl.h"
 #include "node_revert.h"
 #include "util-inl.h"
 

diff --git a/src/node_task_queue.cc b/src/node_task_queue.cc
@@ -2,7 +2,7 @@
 #include "node.h"
 #include "node_errors.h"
 #include "node_internals.h"
-#include "node_process.h"
+#include "node_process-inl.h"
 #include "util-inl.h"
 #include "v8.h"
 

diff --git a/src/signal_wrap.cc b/src/signal_wrap.cc
@@ -22,7 +22,7 @@
 #include "async_wrap-inl.h"
 #include "env-inl.h"
 #include "handle_wrap.h"
-#include "node_process.h"
+#include "node_process-inl.h"
 #include "util-inl.h"
 #include "v8.h"
 

diff --git a/src/uv.cc b/src/uv.cc
@@ -22,7 +22,7 @@
 #include "uv.h"
 #include "env-inl.h"
 #include "node.h"
-#include "node_process.h"
+#include "node_process-inl.h"
 
 namespace node {