report: widen scope of #ifndef

cjihrig · addaleax · commit 3f400310bdfe · 2019-02-09T00:45:07.000+01:00
This commit moves a #ifndef _WIN32 to contain the entire if statement that inspects file descriptors. Prior to this commit, the #ifndef was inside the if, making it essentially dead code on Windows. PR-URL: #25960 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com>
diff --git a/src/node_report_utils.cc b/src/node_report_utils.cc
@@ -163,12 +163,12 @@ void WalkHandle(uv_handle_t* h, void* arg) {
          << ", recv buffer size: " << recv_size;
   }
 
+#ifndef _WIN32
   if (h->type == UV_TCP || h->type == UV_NAMED_PIPE || h->type == UV_TTY ||
       h->type == UV_UDP || h->type == UV_POLL) {
     uv_os_fd_t fd_v;
     int rc = uv_fileno(h, &fd_v);
-    // uv_os_fd_t is an int on Unix and HANDLE on Windows.
-#ifndef _WIN32
+
     if (rc == 0) {
       switch (fd_v) {
         case 0:
@@ -185,8 +185,8 @@ void WalkHandle(uv_handle_t* h, void* arg) {
           break;
       }
     }
-#endif
   }
+#endif
 
   if (h->type == UV_TCP || h->type == UV_NAMED_PIPE || h->type == UV_TTY) {
     data << ", write queue size: " << handle->stream.write_queue_size;

Original file line number	Diff line number	Diff line change
`@@ -163,12 +163,12 @@ void WalkHandle(uv_handle_t* h, void* arg) {`
`163`	`163`	`<< ", recv buffer size: " << recv_size;`
`164`	`164`	`}`
`165`	`165`
	`166`	`+#ifndef _WIN32`
`166`	`167`	`if (h->type == UV_TCP \|\| h->type == UV_NAMED_PIPE \|\| h->type == UV_TTY \|\|`
`167`	`168`	`h->type == UV_UDP \|\| h->type == UV_POLL) {`
`168`	`169`	`uv_os_fd_t fd_v;`
`169`	`170`	`int rc = uv_fileno(h, &fd_v);`
`170`		`- // uv_os_fd_t is an int on Unix and HANDLE on Windows.`
`171`		`-#ifndef _WIN32`
	`171`	`+`
`172`	`172`	`if (rc == 0) {`
`173`	`173`	`switch (fd_v) {`
`174`	`174`	`case 0:`
`@@ -185,8 +185,8 @@ void WalkHandle(uv_handle_t* h, void* arg) {`
`185`	`185`	`break;`
`186`	`186`	`}`
`187`	`187`	`}`
`188`		`-#endif`
`189`	`188`	`}`
	`189`	`+#endif`
`190`	`190`
`191`	`191`	`if (h->type == UV_TCP \|\| h->type == UV_NAMED_PIPE \|\| h->type == UV_TTY) {`
`192`	`192`	`data << ", write queue size: " << handle->stream.write_queue_size;`