andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix more xcalloc stupidity. 

Did I mention the hate?  Pretty sure I mentioned the hate.
This commit is contained in:
Adam Jackson 2008-10-08 16:25:59 -04:00
parent 4fe80aa14a
commit 7aa535708f
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/dmx/input/dmxbackend.c
View File

@ -104,7 +104,7 @@ typedef struct _myPrivate {
pointer dmxBackendCreatePrivate(DeviceIntPtr pDevice)
{
GETDMXLOCALFROMPDEVICE;
myPrivate *priv = xcalloc(1, sizeof(*priv));
myPrivate *priv = calloc(1, sizeof(*priv));
priv->dmxLocal = dmxLocal;
return priv;
}
@ -114,7 +114,7 @@ pointer dmxBackendCreatePrivate(DeviceIntPtr pDevice)
* #dmxBackendCreatePrivate. */
void dmxBackendDestroyPrivate(pointer private)
{
if (private) xfree(private);
if (private) free(private);
}
static void *dmxBackendTestScreen(DMXScreenInfo *dmxScreen, void *closure)

4
hw/dmx/input/dmxconsole.c
View File

@ -140,7 +140,7 @@ static int unscaley(myPrivate *priv, int y)
pointer dmxConsoleCreatePrivate(DeviceIntPtr pDevice)
{
GETDMXLOCALFROMPDEVICE;
myPrivate *priv = xcalloc(1, sizeof(*priv));
myPrivate *priv = calloc(1, sizeof(*priv));
priv->dmxLocal = dmxLocal;
return priv;
}
@ -148,7 +148,7 @@ pointer dmxConsoleCreatePrivate(DeviceIntPtr pDevice)
/** If \a private is non-NULL, free its associated memory. */
void dmxConsoleDestroyPrivate(pointer private)
{
if (private) xfree(private);
if (private) free(private);
}
static void dmxConsoleDrawFineCursor(myPrivate *priv, XRectangle *rect)

4
hw/dmx/input/lnx-ms.c
View File

@ -292,7 +292,7 @@ void msLinuxVTPostSwitch(pointer p)
/** Create a private structure for use within this file. */
pointer msLinuxCreatePrivate(DeviceIntPtr pMouse)
{
myPrivate *priv = xcalloc(1, sizeof(*priv));
myPrivate *priv = calloc(1, sizeof(*priv));
priv->fd = -1;
priv->pMouse = pMouse;
return priv;
@ -301,7 +301,7 @@ pointer msLinuxCreatePrivate(DeviceIntPtr pMouse)
/** Destroy a private structure. */
void msLinuxDestroyPrivate(pointer priv)
{
if (priv) xfree(priv);
if (priv) free(priv);
}
/** Fill the \a info structure with information needed to initialize \a

4
hw/dmx/input/lnx-ps2.c
View File

@ -260,7 +260,7 @@ void ps2LinuxVTPostSwitch(pointer p)
/** Create a private structure for use within this file. */
pointer ps2LinuxCreatePrivate(DeviceIntPtr pMouse)
{
myPrivate *priv = xcalloc(1, sizeof(*priv));
myPrivate *priv = calloc(1, sizeof(*priv));
priv->fd = -1;
priv->pMouse = pMouse;
return priv;
@ -269,7 +269,7 @@ pointer ps2LinuxCreatePrivate(DeviceIntPtr pMouse)
/** Destroy a private structure. */
void ps2LinuxDestroyPrivate(pointer priv)
{
if (priv) xfree(priv);
if (priv) free(priv);
}
/** Fill the \a info structure with information needed to initialize \a

4
hw/dmx/input/usb-common.c
View File

@ -368,7 +368,7 @@ void usbOff(DevicePtr pDev)
/** Create a private structure for use within this file. */
pointer usbCreatePrivate(DeviceIntPtr pDevice)
{
myPrivate *priv = xcalloc(1, sizeof(*priv));
myPrivate *priv = calloc(1, sizeof(*priv));
priv->fd = -1;
priv->pDevice = pDevice;
return priv;
@ -377,5 +377,5 @@ pointer usbCreatePrivate(DeviceIntPtr pDevice)
/** Destroy a private structure. */
void usbDestroyPrivate(pointer priv)
{
if (priv) xfree(priv);
if (priv) free(priv);
}