[patch] Remove reference to non-existing requestLog

Peter Hutterer peter.hutterer at who-t.net
Tue May 26 16:53:43 PDT 2009


On Sat, May 23, 2009 at 01:35:24PM +0200, Nicolai Hähnle wrote:
> Building the X server with --enable-debug configured fails for me with an 
> error in dispatch.c. The attached patch simply removes the offending code, 
> which appears to be some left-over of an old debugging facility (?).
> 
> cu,
> Nicolai

> From 9a538dcc934438d2ca6c337bfb8d9cddc5ede2c6 Mon Sep 17 00:00:00 2001
> From: Nicolai Haehnle <nhaehnle at gmail.com>
> Date: Sat, 23 May 2009 13:29:19 +0200
> Subject: [PATCH] Remove reference to non-existing requestLog and requestLogIndex
> 
> Signed-off-by: Nicolai Haehnle <nhaehnle at gmail.com>
> ---
>  dix/dispatch.c      |    6 ------
>  include/dixstruct.h |    4 ----
>  2 files changed, 0 insertions(+), 10 deletions(-)
> 
> diff --git a/dix/dispatch.c b/dix/dispatch.c
> index ce3294d..dbb97e0 100644
> --- a/dix/dispatch.c
> +++ b/dix/dispatch.c
> @@ -413,12 +413,6 @@ Dispatch(void)
>  	        }
>  
>  		client->sequence++;
> -#ifdef DEBUG
> -		if (client->requestLogIndex == MAX_REQUEST_LOG)
> -		    client->requestLogIndex = 0;
> -		client->requestLog[client->requestLogIndex] = MAJOROP;
> -		client->requestLogIndex++;
> -#endif
>  #ifdef XSERVER_DTRACE
>  		XSERVER_REQUEST_START(LookupMajorName(MAJOROP), MAJOROP,
>  			      ((xReq *)client->requestBuffer)->length,
> diff --git a/include/dixstruct.h b/include/dixstruct.h
> index 7335fad..696b793 100644
> --- a/include/dixstruct.h
> +++ b/include/dixstruct.h
> @@ -37,10 +37,6 @@ SOFTWARE.
>   *      translation from client ids to server addresses.
>   */
>  
> -#ifdef DEBUG
> -#define MAX_REQUEST_LOG 100
> -#endif
> -
>  extern _X_EXPORT CallbackListPtr ClientStateCallback;
>  
>  typedef struct {
> -- 
> 1.5.6.3

Thanks, merged. will be pushed soon. FWIW, that error was triggered by code
removal in 252ec504817e05b185e4896a2d899e9c00b8aeef.

Cheers,
  Peter


More information about the xorg-devel mailing list