diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-10-06 15:36:51 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-10-06 15:36:51 -0400 |
| commit | 8a5b89e8e184f4cbf33c6dee0b06e61d8f857576 (patch) | |
| tree | b042833775d237a3971eae7a7192400e064ad50d /hw/kdrive | |
| parent | 0b7b89fbac0b3865b2cf51295c68a5f4c7523f28 (diff) | |
xalloc+memset(0) -> xcalloc
Diffstat (limited to 'hw/kdrive')
| -rw-r--r-- | hw/kdrive/ephyr/ephyr.c | 3 | ||||
| -rw-r--r-- | hw/kdrive/fake/fake.c | 3 | ||||
| -rw-r--r-- | hw/kdrive/fbdev/fbdev.c | 3 | ||||
| -rw-r--r-- | hw/kdrive/linux/evdev.c | 6 | ||||
| -rw-r--r-- | hw/kdrive/src/kdrive.c | 3 | ||||
| -rw-r--r-- | hw/kdrive/vesa/vesa.c | 6 |
6 files changed, 8 insertions, 16 deletions
diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c index 408144e61..ab8459cfc 100644 --- a/hw/kdrive/ephyr/ephyr.c +++ b/hw/kdrive/ephyr/ephyr.c @@ -185,12 +185,11 @@ ephyrScreenInit (KdScreenInfo *screen) { EphyrScrPriv *scrpriv; - scrpriv = xalloc (sizeof (EphyrScrPriv)); + scrpriv = xcalloc (1, sizeof (EphyrScrPriv)); if (!scrpriv) return FALSE; - memset (scrpriv, 0, sizeof (EphyrScrPriv)); screen->driver = scrpriv; if (!ephyrScreenInitialize (screen, scrpriv)) diff --git a/hw/kdrive/fake/fake.c b/hw/kdrive/fake/fake.c index d77c4f106..ff597981d 100644 --- a/hw/kdrive/fake/fake.c +++ b/hw/kdrive/fake/fake.c @@ -121,10 +121,9 @@ fakeScreenInit (KdScreenInfo *screen) { FakeScrPriv *scrpriv; - scrpriv = xalloc (sizeof (FakeScrPriv)); + scrpriv = xcalloc (1, sizeof (FakeScrPriv)); if (!scrpriv) return FALSE; - memset (scrpriv, '\0', sizeof (FakeScrPriv)); screen->driver = scrpriv; if (!fakeScreenInitialize (screen, scrpriv)) { diff --git a/hw/kdrive/fbdev/fbdev.c b/hw/kdrive/fbdev/fbdev.c index 35ca4dec6..04f697b9e 100644 --- a/hw/kdrive/fbdev/fbdev.c +++ b/hw/kdrive/fbdev/fbdev.c @@ -297,10 +297,9 @@ fbdevScreenInit (KdScreenInfo *screen) { FbdevScrPriv *scrpriv; - scrpriv = xalloc (sizeof (FbdevScrPriv)); + scrpriv = xcalloc (1, sizeof (FbdevScrPriv)); if (!scrpriv) return FALSE; - memset (scrpriv, '\0', sizeof (FbdevScrPriv)); screen->driver = scrpriv; if (!fbdevScreenInitialize (screen, scrpriv)) { diff --git a/hw/kdrive/linux/evdev.c b/hw/kdrive/linux/evdev.c index 2eaa1e332..4ccd82239 100644 --- a/hw/kdrive/linux/evdev.c +++ b/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); diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c index 1478a944d..d93e343e5 100644 --- a/hw/kdrive/src/kdrive.c +++ b/hw/kdrive/src/kdrive.c @@ -739,10 +739,9 @@ KdAllocatePrivates (ScreenPtr pScreen) if (kdGeneration != serverGeneration) kdGeneration = serverGeneration; - pScreenPriv = (KdPrivScreenPtr) xalloc(sizeof (*pScreenPriv)); + pScreenPriv = xcalloc(1, sizeof (*pScreenPriv)); if (!pScreenPriv) return FALSE; - memset (pScreenPriv, '\0', sizeof (KdPrivScreenRec)); KdSetScreenPriv (pScreen, pScreenPriv); return TRUE; } diff --git a/hw/kdrive/vesa/vesa.c b/hw/kdrive/vesa/vesa.c index 316b873ab..b7cc8f1e9 100644 --- a/hw/kdrive/vesa/vesa.c +++ b/hw/kdrive/vesa/vesa.c @@ -175,10 +175,8 @@ vesaGetModes (Vm86InfoPtr vi, int *ret_nmode) if (nmode <= 0) return 0; - modes = xalloc (nmode * sizeof (VesaModeRec)); - - memset (modes, '\0', nmode * sizeof (VesaModeRec)); - + modes = xcalloc (nmode, sizeof (VesaModeRec)); + if (nmodeVga) { code = VgaGetModes (vi, modes, nmodeVga); |