diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
| commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
| tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/hw/kdrive/linux/evdev.c | |
| parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
| parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
| download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/hw/kdrive/linux/evdev.c')
| -rw-r--r-- | xorg-server/hw/kdrive/linux/evdev.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xorg-server/hw/kdrive/linux/evdev.c b/xorg-server/hw/kdrive/linux/evdev.c index 2eaa1e332..4ccd82239 100644 --- a/xorg-server/hw/kdrive/linux/evdev.c +++ b/xorg-server/hw/kdrive/linux/evdev.c @@ -251,13 +251,12 @@ EvdevPtrEnable (KdPointerInfo *pi) close (fd); return BadMatch; } - ke = xalloc (sizeof (Kevdev)); + ke = xcalloc (1, sizeof (Kevdev)); if (!ke) { close (fd); return BadAlloc; } - memset (ke, '\0', sizeof (Kevdev)); if (ISBITSET (ev, EV_KEY)) { if (ioctl (fd, EVIOCGBIT (EV_KEY, sizeof (ke->keybits)), @@ -440,12 +439,11 @@ EvdevKbdEnable (KdKeyboardInfo *ki) return BadMatch; } - ke = xalloc (sizeof (Kevdev)); + ke = xcalloc (1, sizeof (Kevdev)); if (!ke) { close (fd); return BadAlloc; } - memset (ke, '\0', sizeof (Kevdev)); if (!KdRegisterFd (fd, EvdevKbdRead, ki)) { xfree (ke); |