Merge branch 'uli42-pr/remove_requestlog' into 3.6.x

nx-X11/programs/Xserver/dix/dispatch.c

@@ -416,12 +416,6 @@ Dispatch(void)
 	        }
 
 		client->sequence++;
-#ifdef DEBUG
-		if (client->requestLogIndex == MAX_REQUEST_LOG)
-		    client->requestLogIndex = 0;
-		client->requestLog[client->requestLogIndex] = MAJOROP;
-		client->requestLogIndex++;
-#endif
 		if (result > (maxBigRequestSize << 2))
 		    result = BadLength;
 		else
@@ -3622,9 +3616,6 @@ void InitClient(ClientPtr client, int i, void * ospriv)
     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;

nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c

@@ -468,12 +468,6 @@ Reply   Total	Cached	Bits In			Bits Out		Bits/Reply	  Ratio
 #endif
 
 		client->sequence++;
-#ifdef DEBUG
-		if ((client->requestLogIndex >= MAX_REQUEST_LOG) || (client->requestLogIndex <= 0))
-		    client->requestLogIndex = 0;
-		client->requestLog[client->requestLogIndex] = MAJOROP;
-		client->requestLogIndex++;
-#endif
 		if (result > (maxBigRequestSize << 2))
 		    result = BadLength;
 		else

nx-X11/programs/Xserver/include/dixstruct.h

@@ -37,10 +37,6 @@ SOFTWARE.
  *      translation from client ids to server addresses.
  */
 
-#ifdef DEBUG
-#define MAX_REQUEST_LOG 100
-#endif
-
 extern CallbackListPtr ClientStateCallback;
 
 typedef struct {
@@ -121,10 +117,6 @@ typedef struct _Client {
     KeyCode		minKC,maxKC;
 #endif
 
-#ifdef DEBUG
-    unsigned char requestLog[MAX_REQUEST_LOG];
-    int         requestLogIndex;
-#endif
     unsigned long replyBytesRemaining;
 #ifdef XCSECURITY
     XID		authId;