xserver: Branch 'input-hotplug'

Daniel Stone daniels at kemper.freedesktop.org
Tue Aug 15 15:54:17 EEST 2006


 dix/events.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

New commits:
diff-tree cd3f744b1f983f71476db99c050045d981c5f5b2 (from 5d073697adb3864133fa3221b82ab8d2f4a59758)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Tue Aug 15 15:54:13 2006 +0300

    fix missing brace, trim unused variables

diff --git a/dix/events.c b/dix/events.c
index 6eb1257..571a576 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -4711,11 +4711,10 @@ GetKeyboardEvents(xEvent *events, Device
 int GetKeyboardValuatorEvents(xEvent *events, DeviceIntPtr pDev, int type,
                               int key_code, int num_valuators,
                               int *valuators) {
-    int numEvents = 0, numRepeatEvents = 0, ms = 0, first_valuator = 0, i = 0;
+    int numEvents = 0, ms = 0, first_valuator = 0;
     KeySym sym = pDev->key->curKeySyms.map[key_code * pDev->key->curKeySyms.mapWidth];
     deviceKeyButtonPointer *kbp = NULL;
     deviceValuator *xv = NULL;
-    xEvent *repeatEvents = NULL;
     KeyClassPtr ckeyc;
 #ifdef XKB
     xkbMapNotify mn;
@@ -4779,6 +4778,7 @@ int GetKeyboardValuatorEvents(xEvent *ev
                                                    num_valuators, valuators);
             events += numEvents;
         }
+    }
     
 
     ms = GetTimeInMillis();
@@ -4960,7 +4960,6 @@ GetPointerEvents(xEvent *events, DeviceI
     deviceKeyButtonPointer *kbp = NULL;
     deviceValuator *xv = NULL;
     AxisInfoPtr axes = NULL;
-    xEvent *ev = NULL;
     Bool sendValuators = (type == MotionNotify || flags & POINTER_ABSOLUTE);
     DeviceIntPtr cp = inputInfo.pointer;
 



More information about the xorg-commit mailing list