From 5cf76eb8f489f6c4d1ba76bf6fe782c3cf45803d Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sat, 21 Jul 2012 11:36:18 -0700 Subject: 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 Reviewed-by: Mark Kettenis --- scope.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'scope.c') 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); } -- cgit v1.2.1