[PATCH] Fix "warning: unused variable XXX"

[Peter Hutterer]

On Tue, Feb 03, 2009 at 11:54:53PM +0100, Tomas Carnecky wrote:
> events.c:4614: warning: unused variable ‘kbd’
> xkbUtils.c:361: warning: unused variable ‘maxKeysPerMod’
> xf86Events.c:409: warning: unused variable ‘ke’
> generic.c:131: warning: unused variable ‘cs’
> generic.c:130: warning: unused variable ‘size’
> xf86RandR12.c:591: warning: unused variable ‘crtc’
> 
> Signed-off-by: Tomas Carnecky <tom at dbservice.com>
> ---
>  dix/events.c                   |    1 -
>  hw/xfree86/common/xf86Events.c |    1 -
>  hw/xfree86/int10/generic.c     |    3 +--
>  hw/xfree86/modes/xf86RandR12.c |    1 -
>  xkb/xkbUtils.c                 |    2 +-
>  5 files changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/dix/events.c b/dix/events.c
> index 0c8d198..2a35aa3 100644
> --- a/dix/events.c
> +++ b/dix/events.c
> @@ -4611,7 +4611,6 @@ ProcQueryPointer(ClientPtr client)
>      xQueryPointerReply rep;
>      WindowPtr pWin, t;
>      DeviceIntPtr mouse = PickPointer(client);
> -    DeviceIntPtr kbd = PickKeyboard(client);
>      SpritePtr pSprite;
>      int rc;
>      REQUEST(xResourceReq);
> diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
> index 50a5bf6..592d4e3 100644
> --- a/hw/xfree86/common/xf86Events.c
> +++ b/hw/xfree86/common/xf86Events.c
> @@ -406,7 +406,6 @@ static void
>  xf86ReleaseKeys(DeviceIntPtr pDev)
>  {
>      KeyClassPtr keyc;
> -    xEvent ke;
>      int i, j, nevents, sigstate;
>  
>      if (!pDev || !pDev->key)
> diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
> index 0af7c1b..4808108 100644
> --- a/hw/xfree86/int10/generic.c
> +++ b/hw/xfree86/int10/generic.c
> @@ -126,8 +126,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
>      int screen;
>      legacyVGARec vga;
>   
> -#ifdef _PC
> -    int size;
> +#if 0
>      CARD32 cs;
>  #endif
>  

Are you sure about this one?

> diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
> index 83a4f4f..ab39329 100644
> --- a/hw/xfree86/modes/xf86RandR12.c
> +++ b/hw/xfree86/modes/xf86RandR12.c
> @@ -588,7 +588,6 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
>  	else
>  	{
>  	    xf86OutputPtr   output = config->output[config->compat_output];
> -	    xf86CrtcPtr	    crtc = output->crtc;
>  
>  	    if (output->conf_monitor &&
>  		(output->conf_monitor->mon_width  > 0 &&
> diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
> index 807c654..98f9fc5 100644
> --- a/xkb/xkbUtils.c
> +++ b/xkb/xkbUtils.c
> @@ -358,7 +358,7 @@ KeySymsPtr
>  XkbGetCoreMap(DeviceIntPtr keybd)
>  {
>  register int		key,tmp;
> -int			maxSymsPerKey,maxKeysPerMod, maxGroup1Width;
> +int			maxSymsPerKey, maxGroup1Width;
>  XkbDescPtr		xkb;
>  KeySymsPtr              syms;
>  int			maxNumberOfGroups;
> -- 
> 1.6.1.2

Cheers,
  Peter