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/src/kinfo.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/src/kinfo.c')
| -rw-r--r-- | xorg-server/hw/kdrive/src/kinfo.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xorg-server/hw/kdrive/src/kinfo.c b/xorg-server/hw/kdrive/src/kinfo.c index 2621f10dd..d592e6803 100644 --- a/xorg-server/hw/kdrive/src/kinfo.c +++ b/xorg-server/hw/kdrive/src/kinfo.c @@ -34,10 +34,9 @@ KdCardInfoAdd (KdCardFuncs *funcs, { KdCardInfo *ci, **prev; - ci = (KdCardInfo *) xalloc (sizeof (KdCardInfo)); + ci = xcalloc (1, sizeof (KdCardInfo)); if (!ci) return 0; - bzero (ci, sizeof (KdCardInfo)); for (prev = &kdCardInfo; *prev; prev = &(*prev)->next); *prev = ci; ci->cfuncs = funcs; @@ -80,10 +79,9 @@ KdScreenInfoAdd (KdCardInfo *ci) KdScreenInfo *si, **prev; int n; - si = (KdScreenInfo *) xalloc (sizeof (KdScreenInfo)); + si = xcalloc (1, sizeof (KdScreenInfo)); if (!si) return 0; - bzero (si, sizeof (KdScreenInfo)); for (prev = &ci->screenList, n = 0; *prev; prev = &(*prev)->next, n++); *prev = si; si->next = 0; |