[PATCH app/xfs 1/2] xtrans: Simplify an error path when started from inetd

Adam Jackson ajax at redhat.com
Mon Nov 6 23:52:23 UTC 2017


The old code is redundant, since our caller looks like:

    OldListen = _FontTransGetInetdListenInfo (inetdListener);
    if (OldListen == NULL) {
        FatalError("failed to initialize OldListen to inetd socket: %s\n",
                   strerror(errno));
    }

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 os/xfstrans.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/os/xfstrans.c b/os/xfstrans.c
index e147953..edc1d05 100644
--- a/os/xfstrans.c
+++ b/os/xfstrans.c
@@ -79,10 +79,7 @@ TRANS(GetInetdListenInfo) (int fd)
 #endif
 
     if (listen (fd, BACKLOG) < 0)
-    {
-	FatalError("listen() failed on inetd socket: %s\n",
-		   strerror(errno));
-    }
+        return NULL;
 
     /* Pass the inetd socket back through the connection setup code
      * the same way as a cloned listening port
-- 
2.14.3



More information about the xorg-devel mailing list