On Tue, Sep 08, 2009 at 12:54:48PM +1000, Daniel Stone wrote:
> Hi,
> 
> On Mon, Sep 07, 2009 at 04:08:54PM +1000, Peter Hutterer wrote:
> > InitKeyboardDeviceStruct initialised dev->xkbInfo->desc which is somehow
> > used by kdrive but was never initialized.
> 
> I can't see any users, might as well just delete the member.

>From 250974d7d007e6c6e6e65b267c838305b78b7649 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <[email protected]>
Date: Mon, 7 Sep 2009 15:59:37 +1000
Subject: [PATCH] kdrive: remove xkb member from KdKeyboardInfo

Wasn't being used by anyone.

Signed-off-by: Peter Hutterer <[email protected]>
---
 hw/kdrive/src/kdrive.h |    1 -
 hw/kdrive/src/kinput.c |    1 -
 2 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h
index 6fdb708..9620391 100644
--- a/hw/kdrive/src/kdrive.h
+++ b/hw/kdrive/src/kdrive.h
@@ -295,7 +295,6 @@ struct _KdKeyboardInfo {
     char                *name;
     char                *path;
     int                 inputClass;
-    XkbDescPtr          xkb;
     char                *xkbRules;
     char                *xkbModel;
     char                *xkbLayout;
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index 318d233..832b09c 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -1120,7 +1120,6 @@ KdParseKeyboard (char *arg)
     ki->path = NULL;
     ki->driver = NULL;
     ki->driverPrivate = NULL;
-    ki->xkb = NULL;
     ki->next = NULL;
 
     if (!arg)
-- 
1.6.3.rc1.2.g0164.dirty


_______________________________________________
xorg-devel mailing list
[email protected]
http://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to