xserver: Branch 'master' - 2 commits

[Peter Hutterer]

 hw/xfree86/common/xf86Xinput.c |    3 ---
 xfixes/cursor.c                |    6 ++----
 2 files changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 2a890d85e923e1da0331b02e58e95f98b11f5de0
Author: Thomas Jaeger <ThJaeger at gmail.com>
Date:   Sun Sep 20 01:31:59 2009 -0400

    fixes: Make sure invisible cursor is inialized with zero src/mask
    
    This fixes a regression introduced in 9040dab76182d1a019ca7fef7b29733d2c199e61.
    
    Signed-off-by: Thomas Jaeger <ThJaeger at gmail.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/xfixes/cursor.c b/xfixes/cursor.c
index 0c70660..aac90e3 100644
--- a/xfixes/cursor.c
+++ b/xfixes/cursor.c
@@ -1049,13 +1049,11 @@ createInvisibleCursor (void)
     unsigned char *psrcbits, *pmaskbits;
     CursorMetricRec cm;
 
-    psrcbits = (unsigned char *) xalloc(4);
-    pmaskbits = (unsigned char *) xalloc(4);
+    psrcbits = (unsigned char *) xcalloc(4, 1);
+    pmaskbits = (unsigned char *) xcalloc(4, 1);
     if (psrcbits == NULL || pmaskbits == NULL) {
 	return NULL;
     }
-    *psrcbits = 0;
-    *pmaskbits = 0;
 
     cm.width = 1;
     cm.height = 1;
commit 2bb3f0c87119e73157141431d7c00ab104d4b34b
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Sep 18 10:27:14 2009 +1000

    xfree86: remove now unused variable
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index df51400..974b30e 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -1074,9 +1074,6 @@ xf86InitValuatorDefaults(DeviceIntPtr dev, int axnum)
 void
 xf86DisableDevice(DeviceIntPtr dev, Bool panic)
 {
-    devicePresenceNotify ev;
-    DeviceIntRec dummyDev;
-
     if(!panic)
     {
         DisableDevice(dev, TRUE);