os: remove unused functionsgeneration-removal

ResetWellKnownSockets and aggregate are not need anymore.

Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>

5 files changed, 9 insertions, 55 deletions

diff --git a/include/os.h b/include/os.h
index 7572bd2fc..264e960a2 100644
--- a/include/os.h
+++ b/include/os.h
@@ -120,8 +120,6 @@ extern _X_EXPORT void NotifyParentProcess(void);
 
 extern _X_EXPORT void CreateWellKnownSockets(void);
 
-extern _X_EXPORT void ResetWellKnownSockets(void);
-
 extern _X_EXPORT void CloseWellKnownConnections(void);
 
 extern _X_EXPORT XID AuthorizationIDOfClient(ClientPtr /*client*/);
@@ -373,8 +371,9 @@ extern _X_EXPORT XID CheckAuthorization(
     ClientPtr /*client*/,
     char ** /*reason*/
 );
-
+#ifdef XQUARTZ
 extern _X_EXPORT void ResetAuthorization(void);
+#endif
 
 extern _X_EXPORT int RemoveAuthorization (
     unsigned short	name_length,
diff --git a/os/auth.c b/os/auth.c
index a852e1c3b..ddf496369 100644
--- a/os/auth.c
+++ b/os/auth.c
@@ -221,6 +221,7 @@ CheckAuthorization (
     return (XID) ~0L;
 }
 
+#ifdef XQUARTZ
 void
 ResetAuthorization (void)
 {
@@ -231,6 +232,7 @@ ResetAuthorization (void)
 	    (*protocols[i].Reset)();
     ShouldLoadAuth = TRUE;
 }
+#endif
 
 int
 AuthorizationFromID (
diff --git a/os/connection.c b/os/connection.c
index 3ff93bbb6..26778c1b0 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -47,7 +47,7 @@ SOFTWARE.
 /*****************************************************************
  *  Stuff to create connections --- OS dependent
  *
- *      EstablishNewConnections, CreateWellKnownSockets, ResetWellKnownSockets,
+ *      EstablishNewConnections, CreateWellKnownSockets,
  *      CloseDownConnection, CheckConnections, AddEnabledDevice,
  *	RemoveEnabledDevice, OnlyListToOneClient,
  *      ListenToAllClients,
@@ -433,57 +433,6 @@ CreateWellKnownSockets(void)
 }
 
 void
-ResetWellKnownSockets (void)
-{
-    int i;
-
-    ResetOsBuffers();
-
-    for (i = 0; i < ListenTransCount; i++)
-    {
-	int status = _XSERVTransResetListener (ListenTransConns[i]);
-
-	if (status != TRANS_RESET_NOOP)
-	{
-	    if (status == TRANS_RESET_FAILURE)
-	    {
-		/*
-		 * ListenTransConns[i] freed by xtrans.
-		 * Remove it from out list.
-		 */
-
-		FD_CLR (ListenTransFds[i], &WellKnownConnections);
-		ListenTransFds[i] = ListenTransFds[ListenTransCount - 1];
-		ListenTransConns[i] = ListenTransConns[ListenTransCount - 1];
-		ListenTransCount -= 1;
-		i -= 1;
-	    }
-	    else if (status == TRANS_RESET_NEW_FD)
-	    {
-		/*
-		 * A new file descriptor was allocated (the old one was closed)
-		 */
-
-		int newfd = _XSERVTransGetConnectionNumber (ListenTransConns[i]);
-
-		FD_CLR (ListenTransFds[i], &WellKnownConnections);
-		ListenTransFds[i] = newfd;
-		FD_SET(newfd, &WellKnownConnections);
-	    }
-	}
-    }
-
-    ResetAuthorization ();
-    ResetHosts(display);
-    /*
-     * restart XDMCP
-     */
-#ifdef XDMCP
-    XdmcpReset ();
-#endif
-}
-
-void
 CloseWellKnownConnections(void)
 {
     int i;
diff --git a/os/osdep.h b/os/osdep.h
index 3d75bbaab..63d943589 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -259,7 +259,9 @@ extern void XdmcpRegisterConnection (
 extern void XdmcpRegisterAuthorizations (void);
 extern void XdmcpRegisterAuthorization (char *name, int namelen);
 extern void XdmcpInit (void);
+#ifdef XQUARTZ
 extern void XdmcpReset (void);
+#endif
 extern void XdmcpOpenDisplay(int sock);
 extern void XdmcpCloseDisplay(int sock);
 extern void XdmcpRegisterAuthentication (
diff --git a/os/xdmcp.c b/os/xdmcp.c
index 72b18a74b..510f789e1 100644
--- a/os/xdmcp.c
+++ b/os/xdmcp.c
@@ -588,6 +588,7 @@ XdmcpInit(void)
     }
 }
 
+#ifdef XQUARTZ
 void
 XdmcpReset (void)
 {
@@ -600,6 +601,7 @@ XdmcpReset (void)
     	send_packet();
     }
 }
+#endif
 
 /*
  * Called whenever a new connection is created; notices the