xserver: Branch 'master'

[Peter Hutterer]

 Xi/exevents.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3be80bd98357cf362aa9a004d1292e5167d83a17
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Aug 28 16:20:59 2009 +1000

    Xi: silence compiler warning "type may be used uninitialized"
    
    GrabKey and GrabButton are only called from XI/XI2 code. Set type to -1,
    just in case.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/Xi/exevents.c b/Xi/exevents.c
index 2377d05..0065619 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -1414,7 +1414,7 @@ GrabButton(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr modifier_device,
     WindowPtr pWin, confineTo;
     CursorPtr cursor;
     GrabPtr grab;
-    int rc, type;
+    int rc, type = -1;
     Mask access_mode = DixGrabAccess;
 
     rc = CheckGrabValues(client, param);
@@ -1472,7 +1472,7 @@ GrabKey(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr modifier_device,
     GrabPtr grab;
     KeyClassPtr k = dev->key;
     Mask access_mode = DixGrabAccess;
-    int rc, type;
+    int rc, type = -1;
 
     rc = CheckGrabValues(client, param);
     if (rc != Success)