xserver: Branch 'master' - 3 commits

[Adam Jackson]

 dix/dispatch.c                        |   23 +----------------------
 hw/xfree86/os-support/linux/lnx_apm.c |    1 -
 include/dixstruct.h                   |   13 ++++---------
 3 files changed, 5 insertions(+), 32 deletions(-)

New commits:
commit 89887fadc97f6fd5059886396a6d7cf61de1982f
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Mar 31 15:09:57 2009 -0400

    APM: Don't carp if not available.

diff --git a/hw/xfree86/os-support/linux/lnx_apm.c b/hw/xfree86/os-support/linux/lnx_apm.c
index 8cf318f..9dae00e 100644
--- a/hw/xfree86/os-support/linux/lnx_apm.c
+++ b/hw/xfree86/os-support/linux/lnx_apm.c
@@ -184,7 +184,6 @@ lnxAPMOpen(void)
 	xf86MsgVerb(X_INFO,3,"Open APM successful\n");
 	return lnxCloseAPM;
     }
-    xf86MsgVerb(X_INFO,3,"No APM support in BIOS or kernel\n");
     return NULL;
 }
 
commit 2e145989d10ef454581f8aa60358ed3782fd6442
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Mar 30 17:22:28 2009 -0400

    dix: Simplify InitClient()

diff --git a/dix/dispatch.c b/dix/dispatch.c
index 0ed95df..a9f9367 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -3459,37 +3459,16 @@ KillAllClients(void)
 
 void InitClient(ClientPtr client, int i, pointer ospriv)
 {
+    memset(client, 0, sizeof(*client));
     client->index = i;
-    client->sequence = 0; 
     client->clientAsMask = ((Mask)i) << CLIENTOFFSET;
-    client->clientGone = FALSE;
     client->closeDownMode = i ? DestroyAll : RetainPermanent;
-    client->numSaved = 0;
-    client->saveSet = (SaveSetElt *)NULL;
-    client->noClientException = Success;
-#ifdef DEBUG
-    client->requestLogIndex = 0;
-#endif
     client->requestVector = InitialVector;
     client->osPrivate = ospriv;
-    client->swapped = FALSE;
-    client->big_requests = FALSE;
-    client->priority = 0;
-    client->clientState = ClientStateInitial;
-    client->devPrivates = NULL;
-    client->xkbClientFlags = 0;
-    client->mapNotifyMask = 0;
-    client->newKeyboardNotifyMask = 0;
-    client->vMinor = client->vMajor = 0;
     QueryMinMaxKeyCodes(&client->minKC,&client->maxKC);
-    client->replyBytesRemaining = 0;
-    client->fontResFunc = NULL;
-    client->smart_priority = 0;
     client->smart_start_tick = SmartScheduleTime;
     client->smart_stop_tick = SmartScheduleTime;
     client->smart_check_tick = SmartScheduleTime;
-
-    client->clientPtr = NULL;
 }
 
 /************************
commit 252ec504817e05b185e4896a2d899e9c00b8aeef
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Mar 30 15:18:30 2009 -0400

    Document which bits of ClientRec are currently unused

diff --git a/include/dixstruct.h b/include/dixstruct.h
index 8bafcde..7335fad 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -89,6 +89,7 @@ typedef struct _Window *SaveSetElt;
 #define SaveSetAssignMap(ss,m)
 #endif
 
+/* The unused_ members are ABI spacing.  Please reuse them. */
 typedef struct _Client {
     int         index;
     Mask        clientAsMask;
@@ -104,7 +105,7 @@ typedef struct _Client {
 					 * killed */
     SaveSetElt	*saveSet;
     int         numSaved;
-    pointer     screenPrivate[MAXSCREENS];
+    void	*unused_screenPrivate[16];
     int         (**requestVector) (
 		ClientPtr /* pClient */);
     CARD32	req_len;		/* length of current request */
@@ -118,15 +119,9 @@ typedef struct _Client {
     unsigned short	vMajor,vMinor;
     KeyCode		minKC,maxKC;
 
-#ifdef DEBUG
-    unsigned char requestLog[MAX_REQUEST_LOG];
-    int         requestLogIndex;
-#endif
     unsigned long replyBytesRemaining;
-    void *appgroup; /* Can't remove, ABI */
-    struct _FontResolution * (*fontResFunc) (    /* no need for font.h */
-		ClientPtr	/* pClient */,
-		int *		/* num */);
+    void *unused_appgroup;
+    void *unused_fontResFunc;
     int	    smart_priority;
     long    smart_start_tick;
     long    smart_stop_tick;