From 845a6214f842f3a5220f4bf4f209c0f5b25d48b5 Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Tue, 9 Apr 2019 22:46:33 +0800 Subject: [PATCH 1/2] src: use macro instead of magic number for fd PR-URL: https://github.com/nodejs/node/pull/27152 Reviewed-By: Richard Lau Reviewed-By: Refael Ackermann Reviewed-By: Colin Ihrig Reviewed-By: James M Snell --- src/node_report_utils.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/node_report_utils.cc b/src/node_report_utils.cc index 5013fd7a875216..23d18fab99f54b 100644 --- a/src/node_report_utils.cc +++ b/src/node_report_utils.cc @@ -192,15 +192,17 @@ void WalkHandle(uv_handle_t* h, void* arg) { if (rc == 0) { writer->json_keyvalue("fd", static_cast(fd_v)); switch (fd_v) { - case 0: + case STDIN_FILENO: writer->json_keyvalue("stdio", "stdin"); break; - case 1: + case STDOUT_FILENO: writer->json_keyvalue("stdio", "stdout"); break; - case 2: + case STDERR_FILENO: writer->json_keyvalue("stdio", "stderr"); break; + default: + break; } } } From ee7daf76c01cdcd4a9ff1a7d1f2591b0886afba3 Mon Sep 17 00:00:00 2001 From: gengjiawen Date: Tue, 9 Apr 2019 22:47:34 +0800 Subject: [PATCH 2/2] src: remove redundant string initialization PR-URL: https://github.com/nodejs/node/pull/27152 Reviewed-By: Richard Lau Reviewed-By: Refael Ackermann Reviewed-By: Colin Ihrig Reviewed-By: James M Snell --- src/node_report_utils.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node_report_utils.cc b/src/node_report_utils.cc index 23d18fab99f54b..81fdeda0405ea4 100644 --- a/src/node_report_utils.cc +++ b/src/node_report_utils.cc @@ -233,7 +233,7 @@ std::string EscapeJsonChars(const std::string& str) { "\\u001a", "\\u001b", "\\u001c", "\\u001d", "\\u001e", "\\u001f" }; - std::string ret = ""; + std::string ret; size_t last_pos = 0; size_t pos = 0; for (; pos < str.size(); ++pos) {