From 663d5715bc6570341a6ba9c1798506c5372e6d28 Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp>
Date: Thu, 29 Dec 2022 14:34:33 +0900
Subject: [PATCH] mruby-io/io.c: new function `io_get_write_fd`

---
 mrbgems/mruby-io/src/io.c | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/mrbgems/mruby-io/src/io.c b/mrbgems/mruby-io/src/io.c
index 7c5aec987..7a0b42ede 100644
--- a/mrbgems/mruby-io/src/io.c
+++ b/mrbgems/mruby-io/src/io.c
@@ -815,6 +815,18 @@ io_get_write_fptr(mrb_state *mrb, mrb_value self)
   return fptr;
 }
 
+static int
+io_get_write_fd(mrb_state *mrb, mrb_value self)
+{
+  struct mrb_io *fptr = io_get_write_fptr(mrb, self);
+  if (fptr->fd2 == -1) {
+    return fptr->fd;
+  }
+  else {
+    return fptr->fd2;
+  }
+}
+
 static mrb_value
 io_isatty(mrb_state *mrb, mrb_value self)
 {
@@ -991,17 +1003,10 @@ io_syswrite_common(mrb_state *mrb,
     fssize_t (*writefunc)(int, const void*, fsize_t, off_t),
     mrb_value io, mrb_value buf, off_t offset)
 {
-  struct mrb_io *fptr;
   int fd;
   fssize_t length;
 
-  fptr = io_get_write_fptr(mrb, io);
-  if (fptr->fd2 == -1) {
-    fd = fptr->fd;
-  }
-  else {
-    fd = fptr->fd2;
-  }
+  fd = io_get_write_fd(mrb, io);
   length = writefunc(fd, RSTRING_PTR(buf), (fsize_t)RSTRING_LEN(buf), offset);
   if (length == -1) {
     mrb_sys_fail(mrb, "syswrite");