From abc5cdc9238aa6e2cc4065352f41819228e0c745 Mon Sep 17 00:00:00 2001
From: Brian White <mscdex@mscdex.net>
Date: Mon, 21 Aug 2017 03:31:24 -0400
Subject: [PATCH] src: remove unnecessary helper function
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ever since e2fcfea46e, `OnReadCommon()` is no longer shared
between more than one function.

PR-URL: https://github.com/nodejs/node/pull/14959
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 src/stream_wrap.cc | 30 ++++++++++--------------------
 src/stream_wrap.h  |  4 ----
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/src/stream_wrap.cc b/src/stream_wrap.cc
index 3497146cb07983..eb156a91a2bdc0 100644
--- a/src/stream_wrap.cc
+++ b/src/stream_wrap.cc
@@ -242,13 +242,18 @@ void StreamWrap::OnReadImpl(ssize_t nread,
 }
 
 
-void StreamWrap::OnReadCommon(uv_stream_t* handle,
-                              ssize_t nread,
-                              const uv_buf_t* buf,
-                              uv_handle_type pending) {
+void StreamWrap::OnRead(uv_stream_t* handle,
+                        ssize_t nread,
+                        const uv_buf_t* buf) {
   StreamWrap* wrap = static_cast<StreamWrap*>(handle->data);
   HandleScope scope(wrap->env()->isolate());
   Context::Scope context_scope(wrap->env()->context());
+  uv_handle_type type = UV_UNKNOWN_HANDLE;
+
+  if (wrap->is_named_pipe_ipc() &&
+      uv_pipe_pending_count(reinterpret_cast<uv_pipe_t*>(handle)) > 0) {
+    type = uv_pipe_pending_type(reinterpret_cast<uv_pipe_t*>(handle));
+  }
 
   // We should not be getting this callback if someone as already called
   // uv_close() on the handle.
@@ -262,22 +267,7 @@ void StreamWrap::OnReadCommon(uv_stream_t* handle,
     }
   }
 
-  static_cast<StreamBase*>(wrap)->OnRead(nread, buf, pending);
-}
-
-
-void StreamWrap::OnRead(uv_stream_t* handle,
-                        ssize_t nread,
-                        const uv_buf_t* buf) {
-  StreamWrap* wrap = static_cast<StreamWrap*>(handle->data);
-  uv_handle_type type = UV_UNKNOWN_HANDLE;
-
-  if (wrap->is_named_pipe_ipc() &&
-      uv_pipe_pending_count(reinterpret_cast<uv_pipe_t*>(handle)) > 0) {
-    type = uv_pipe_pending_type(reinterpret_cast<uv_pipe_t*>(handle));
-  }
-
-  OnReadCommon(handle, nread, buf, type);
+  static_cast<StreamBase*>(wrap)->OnRead(nread, buf, type);
 }
 
 
diff --git a/src/stream_wrap.h b/src/stream_wrap.h
index 161bcd550f65f1..584e524df57170 100644
--- a/src/stream_wrap.h
+++ b/src/stream_wrap.h
@@ -104,10 +104,6 @@ class StreamWrap : public HandleWrap, public StreamBase {
   static void OnRead(uv_stream_t* handle,
                      ssize_t nread,
                      const uv_buf_t* buf);
-  static void OnReadCommon(uv_stream_t* handle,
-                           ssize_t nread,
-                           const uv_buf_t* buf,
-                           uv_handle_type pending);
   static void AfterWrite(uv_write_t* req, int status);
   static void AfterShutdown(uv_shutdown_t* req, int status);