Static cleanups, dead code deletion.

This commit is contained in:
Adam Jackson 2007-03-25 12:27:01 -04:00
commit 9a0f25de7c
54 changed files with 187 additions and 482 deletions

View file

@ -175,7 +175,7 @@ typedef const char *string;
# include <ucred.h>
#endif
int lastfdesc; /* maximum file descriptor */
static int lastfdesc; /* maximum file descriptor */
fd_set WellKnownConnections; /* Listener mask */
fd_set EnabledDevices; /* mask for input devices that are on */
@ -189,7 +189,7 @@ int MaxClients = 0;
Bool NewOutputPending; /* not yet attempted to write some new output */
Bool AnyClientsWriteBlocked; /* true if some client blocked on write */
Bool RunFromSmartParent; /* send SIGUSR1 to parent process */
static Bool RunFromSmartParent; /* send SIGUSR1 to parent process */
Bool PartialNetwork; /* continue even if unable to bind all addrs */
static Pid_t ParentProcess;
#ifdef __UNIXOS2__
@ -298,9 +298,9 @@ void ClearConnectionTranslation(void)
}
#endif
XtransConnInfo *ListenTransConns = NULL;
int *ListenTransFds = NULL;
int ListenTransCount;
static XtransConnInfo *ListenTransConns = NULL;
static int *ListenTransFds = NULL;
static int ListenTransCount;
static void ErrorConnMax(XtransConnInfo /* trans_conn */);

10
os/io.c
View file

@ -111,11 +111,11 @@ _X_EXPORT CallbackListPtr FlushCallback;
#define ETEST(err) (err == EAGAIN || err == EWOULDBLOCK || err == ENOSPC)
#endif
Bool CriticalOutputPending;
int timesThisConnection = 0;
ConnectionInputPtr FreeInputs = (ConnectionInputPtr)NULL;
ConnectionOutputPtr FreeOutputs = (ConnectionOutputPtr)NULL;
OsCommPtr AvailableInput = (OsCommPtr)NULL;
static Bool CriticalOutputPending;
static int timesThisConnection = 0;
static ConnectionInputPtr FreeInputs = (ConnectionInputPtr)NULL;
static ConnectionOutputPtr FreeOutputs = (ConnectionOutputPtr)NULL;
static OsCommPtr AvailableInput = (OsCommPtr)NULL;
#define get_req_len(req,cli) ((cli)->swapped ? \
lswaps((req)->length) : (req)->length)

View file

@ -234,12 +234,6 @@ extern void ClearConnectionTranslation();
extern Bool NewOutputPending;
extern Bool AnyClientsWriteBlocked;
extern Bool CriticalOutputPending;
extern int timesThisConnection;
extern ConnectionInputPtr FreeInputs;
extern ConnectionOutputPtr FreeOutputs;
extern OsCommPtr AvailableInput;
extern WorkQueuePtr workQueue;

View file

@ -245,10 +245,6 @@ _X_EXPORT Bool noXvExtension = FALSE;
Bool CoreDump;
#ifdef PANORAMIX
Bool PanoramiXVisibilityNotifySent = FALSE;
Bool PanoramiXMapped = FALSE;
Bool PanoramiXWindowExposureSent = FALSE;
Bool PanoramiXOneExposeRequest = FALSE;
Bool PanoramiXExtensionDisabledHack = FALSE;
#endif
@ -271,7 +267,7 @@ long Memory_fail = 0;
#include <stdlib.h> /* for random() */
#endif
char *dev_tty_from_init = NULL; /* since we need to parse it anyway */
static char *dev_tty_from_init = NULL; /* since we need to parse it anyway */
OsSigHandlerPtr
OsSignal(sig, handler)

View file

@ -411,11 +411,11 @@ XdmcpRegisterAuthentication (
* set by the manager of the host to be connected to.
*/
ARRAY8 noAuthenticationName = {(CARD16) 0, (CARD8Ptr) 0};
ARRAY8 noAuthenticationData = {(CARD16) 0, (CARD8Ptr) 0};
ARRAY8Ptr AuthenticationName = &noAuthenticationName;
ARRAY8Ptr AuthenticationData = &noAuthenticationData;
AuthenticationFuncsPtr AuthenticationFuncs;
static ARRAY8 noAuthenticationName = {(CARD16) 0, (CARD8Ptr) 0};
static ARRAY8 noAuthenticationData = {(CARD16) 0, (CARD8Ptr) 0};
static ARRAY8Ptr AuthenticationName = &noAuthenticationName;
static ARRAY8Ptr AuthenticationData = &noAuthenticationData;
static AuthenticationFuncsPtr AuthenticationFuncs;
void
XdmcpSetAuthentication (ARRAY8Ptr name)
@ -547,7 +547,7 @@ XdmcpRegisterAuthorization (char *name, int namelen)
* Register the DisplayClass string
*/
ARRAY8 DisplayClass;
static ARRAY8 DisplayClass;
void
XdmcpRegisterDisplayClass (char *name, int length)
@ -565,7 +565,7 @@ XdmcpRegisterDisplayClass (char *name, int length)
* Register the Manufacturer display ID
*/
ARRAY8 ManufacturerDisplayID;
static ARRAY8 ManufacturerDisplayID;
void
XdmcpRegisterManufacturerDisplayID (char *name, int length)
@ -776,7 +776,7 @@ XdmcpAddHost(
* do the appropriate thing
*/
ARRAY8 UnwillingMessage = { (CARD8) 14, (CARD8 *) "Host unwilling" };
static ARRAY8 UnwillingMessage = { (CARD8) 14, (CARD8 *) "Host unwilling" };
static void
receive_packet(int socketfd)