frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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 <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2018-08-29 15:48:28 -04:00 committed by Adam Jackson
parent 7d689f049c
commit 3a4d7c79e7
3 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dix/main.c
View File

@ -136,8 +136,6 @@ dix_main(int argc, char *argv[], char *envp[])
CheckUserAuthorization(); CheckUserAuthorization();
InitConnectionLimits();
ProcessCommandLine(argc, argv); ProcessCommandLine(argc, argv);
alwaysCheckForInput[0] = 0; alwaysCheckForInput[0] = 0;

1
include/opaque.h
View File

@ -35,7 +35,6 @@ from The Open Group.
extern _X_EXPORT const char *defaultTextFont; extern _X_EXPORT const char *defaultTextFont;
extern _X_EXPORT const char *defaultCursorFont; extern _X_EXPORT const char *defaultCursorFont;
extern _X_EXPORT int MaxClients;
extern _X_EXPORT int LimitClients; extern _X_EXPORT int LimitClients;
extern _X_EXPORT volatile char isItTimeToYield; extern _X_EXPORT volatile char isItTimeToYield;
extern _X_EXPORT volatile char dispatchException; extern _X_EXPORT volatile char dispatchException;

13
os/connection.c
View File

@ -120,7 +120,6 @@ SOFTWARE.
struct ospoll *server_poll; struct ospoll *server_poll;
int MaxClients = 0;
Bool NewOutputPending; /* not yet attempted to write some new output */ Bool NewOutputPending; /* not yet attempted to write some new output */
Bool NoListenAll; /* Don't establish any listening sockets */ Bool NoListenAll; /* Don't establish any listening sockets */
@ -162,18 +161,6 @@ lookup_trans_conn(int fd)
return NULL; 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 * If SIGUSR1 was set to SIG_IGN when the server started, assume that either
* *