[PATCH keyboard] Removing unused variable kbdType.

Peter Hutterer peter.hutterer at who-t.net
Sun Nov 28 21:52:53 PST 2010


On Sat, Nov 27, 2010 at 02:39:13AM +0500, Alexandr Shadchin wrote:
> Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin at gmail.com>
> ---
>  src/bsd_KbdMap.c |    2 --
>  src/lnx_KbdMap.c |    2 --
>  src/xf86OSKbd.h  |    1 -
>  3 files changed, 0 insertions(+), 5 deletions(-)
> 
> diff --git a/src/bsd_KbdMap.c b/src/bsd_KbdMap.c
> index 2697f6a..6cfdbe4 100644
> --- a/src/bsd_KbdMap.c
> +++ b/src/bsd_KbdMap.c
> @@ -1026,8 +1026,6 @@ KbdGetMapping (InputInfoPtr pInfo, KeySymsPtr pKeySyms, CARD8 *pModMap)
>        break;
>  
>      }
> -  
> -  pKbd->kbdType = 0;
>  
>    pKeySyms->map        = map;
>    pKeySyms->mapWidth   = GLYPHS_PER_KEY;
> diff --git a/src/lnx_KbdMap.c b/src/lnx_KbdMap.c
> index 21bed2e..2121c5f 100644
> --- a/src/lnx_KbdMap.c
> +++ b/src/lnx_KbdMap.c
> @@ -97,8 +97,6 @@ KbdGetMapping (InputInfoPtr pInfo, KeySymsPtr pKeySyms, CARD8 *pModMap)
>        break;
>  
>      }
> -  
> -  pKbd->kbdType = ioctl(pInfo->fd, KDGKBTYPE, &type) != -1 ? type : KB_101;
>  
>    pKeySyms->map        = map;
>    pKeySyms->mapWidth   = GLYPHS_PER_KEY;
> diff --git a/src/xf86OSKbd.h b/src/xf86OSKbd.h
> index daeabf1..176bcd0 100644
> --- a/src/xf86OSKbd.h
> +++ b/src/xf86OSKbd.h
> @@ -81,7 +81,6 @@ typedef struct {
>  
>      /* os specific */
>      pointer		private;
> -    int			kbdType;
>      int			consType;
>      int			wsKbdType;
>  
> -- 
> 1.7.3.2

merged and pushed, thanks

Cheers,
  Peter


More information about the xorg-devel mailing list