xserver: Branch 'master'
Adam Jackson
ajax at kemper.freedesktop.org
Wed Oct 8 13:26:31 PDT 2008
hw/dmx/input/dmxbackend.c | 4 ++--
hw/dmx/input/dmxconsole.c | 4 ++--
hw/dmx/input/lnx-ms.c | 4 ++--
hw/dmx/input/lnx-ps2.c | 4 ++--
hw/dmx/input/usb-common.c | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 7aa535708f1f33173bf05abc17b75e0841ffc385
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Oct 8 16:25:59 2008 -0400
Fix more xcalloc stupidity.
Did I mention the hate? Pretty sure I mentioned the hate.
diff --git a/hw/dmx/input/dmxbackend.c b/hw/dmx/input/dmxbackend.c
index 14dc973..b94c6d4 100644
--- a/hw/dmx/input/dmxbackend.c
+++ b/hw/dmx/input/dmxbackend.c
@@ -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)
diff --git a/hw/dmx/input/dmxconsole.c b/hw/dmx/input/dmxconsole.c
index 48c7034..9542efa 100644
--- a/hw/dmx/input/dmxconsole.c
+++ b/hw/dmx/input/dmxconsole.c
@@ -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)
diff --git a/hw/dmx/input/lnx-ms.c b/hw/dmx/input/lnx-ms.c
index 705d3f4..549df46 100644
--- a/hw/dmx/input/lnx-ms.c
+++ b/hw/dmx/input/lnx-ms.c
@@ -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
diff --git a/hw/dmx/input/lnx-ps2.c b/hw/dmx/input/lnx-ps2.c
index 78debed..70918ee 100644
--- a/hw/dmx/input/lnx-ps2.c
+++ b/hw/dmx/input/lnx-ps2.c
@@ -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
diff --git a/hw/dmx/input/usb-common.c b/hw/dmx/input/usb-common.c
index 7b4f632..2d3f4dd 100644
--- a/hw/dmx/input/usb-common.c
+++ b/hw/dmx/input/usb-common.c
@@ -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);
}
More information about the xorg-commit
mailing list