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, 3 insertions, 9 deletions

diff --git a/scope.c b/scope.c
index 89049aa..1234f82 100644
--- a/scope.c
+++ b/scope.c
@@ -956,15 +956,9 @@ CloseConnection(FD fd)
     StopClientConnection(ServerHalf(fd));
     StopServerConnection(ClientHalf(fd));
 
-#ifdef USE_XTRANS
-    _X11TransClose(GetXTransConnInfo(fd));
-    _X11TransClose(GetXTransConnInfo(FDPair(fd)));
-#else
-    close(fd);
-    close(FDPair(fd));
-#endif
-    NotUsingFD(fd);
-    NotUsingFD(FDPair(fd));
+    CloseFD(fd);
+    CloseFD(FDPair(fd));
+
     if (TerminateClose)
         exit(0);
 }