From 3a4d7c79e7fb14c6f914db921c3dce1c22f62cd9 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 29 Aug 2018 15:48:28 -0400 Subject: [PATCH] dix: Remove MaxClients This variable was no longer being read anywhere. MAXCLIENTS the macro is the compile-time maximum limit, LIMITCLIENTS the macro is the default limit, LimitClients the variable is the limit for the current server. Signed-off-by: Adam Jackson --- dix/main.c | 2 -- include/opaque.h | 1 - os/connection.c | 13 ------------- 3 files changed, 16 deletions(-) diff --git a/dix/main.c b/dix/main.c index f98643aa5..273f30330 100644 --- a/dix/main.c +++ b/dix/main.c @@ -136,8 +136,6 @@ dix_main(int argc, char *argv[], char *envp[]) CheckUserAuthorization(); - InitConnectionLimits(); - ProcessCommandLine(argc, argv); alwaysCheckForInput[0] = 0; diff --git a/include/opaque.h b/include/opaque.h index 0ba0d64da..bb1f5027b 100644 --- a/include/opaque.h +++ b/include/opaque.h @@ -35,7 +35,6 @@ from The Open Group. extern _X_EXPORT const char *defaultTextFont; extern _X_EXPORT const char *defaultCursorFont; -extern _X_EXPORT int MaxClients; extern _X_EXPORT int LimitClients; extern _X_EXPORT volatile char isItTimeToYield; extern _X_EXPORT volatile char dispatchException; diff --git a/os/connection.c b/os/connection.c index 229bbe745..de9696ec8 100644 --- a/os/connection.c +++ b/os/connection.c @@ -120,7 +120,6 @@ SOFTWARE. struct ospoll *server_poll; -int MaxClients = 0; Bool NewOutputPending; /* not yet attempted to write some new output */ Bool NoListenAll; /* Don't establish any listening sockets */ @@ -162,18 +161,6 @@ lookup_trans_conn(int fd) return NULL; } -/* Set MaxClients */ - -void -InitConnectionLimits(void) -{ - MaxClients = MAXCLIENTS; - -#ifdef DEBUG - ErrorF("InitConnectionLimits: MaxClients = %d\n", MaxClients); -#endif -} - /* * If SIGUSR1 was set to SIG_IGN when the server started, assume that either *