Refactor fd closing into CloseFD helper function

All versions now perform same check for XtransConn data to decide
whether to use _X11TransClose or regular close, which is needed for
being able to read data from pre-recorded files instead of live sockets.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>

1 files changed, 17 insertions, 6 deletions

diff --git a/fd.c b/fd.c
index 4ee9a3e..8ac3e89 100644
--- a/fd.c
+++ b/fd.c
@@ -198,20 +198,31 @@ GetXTransConnInfo(FD fd)
 
 /* ************************************************************ */
 
-static void
-EOFonFD(FD fd)
+void
+CloseFD(FD fd)
 {
-    enterprocedure("EOFonFD");
-    debug(128, (stderr, "EOF on %d\n", fd));
 #ifdef USE_XTRANS
-    if (FDD[fd].trans_conn)
-        _X11TransClose(FDD[fd].trans_conn);
+    XtransConnInfo conn = GetXTransConnInfo(fd);
+
+    if (conn)
+        _X11TransClose(conn);
     else
 #endif
         close(fd);
+
     NotUsingFD(fd);
 }
 
+/* ************************************************************ */
+
+static void
+EOFonFD(FD fd)
+{
+    enterprocedure("EOFonFD");
+    debug(128, (stderr, "EOF on %d\n", fd));
+    CloseFD(fd);
+}
+
 FD
 AcceptConnection(FD ConnectionSocket)
 {