diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-16 20:50:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-16 20:50:58 +0000 |
| commit | 1c94119ae26b94a60bb2c2b33494ed43c3b8a52f (patch) | |
| tree | cfe0c736c95314edac7d9f1065be9c13026ed0c1 /xorg-server/hw/kdrive/src/kdrive.c | |
| parent | 6b29aa4559aeb6f795caee047561654bfa0a1954 (diff) | |
| download | vcxsrv-1c94119ae26b94a60bb2c2b33494ed43c3b8a52f.tar.gz vcxsrv-1c94119ae26b94a60bb2c2b33494ed43c3b8a52f.tar.bz2 vcxsrv-1c94119ae26b94a60bb2c2b33494ed43c3b8a52f.zip | |
svn merge -r588:HEAD ^/branches/released .
Diffstat (limited to 'xorg-server/hw/kdrive/src/kdrive.c')
| -rw-r--r-- | xorg-server/hw/kdrive/src/kdrive.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/hw/kdrive/src/kdrive.c b/xorg-server/hw/kdrive/src/kdrive.c index a8eb3996b..a7db41379 100644 --- a/xorg-server/hw/kdrive/src/kdrive.c +++ b/xorg-server/hw/kdrive/src/kdrive.c @@ -207,7 +207,7 @@ KdDoSwitchCmd (char *reason) {
if (kdSwitchCmd)
{
- char *command = xalloc (strlen (kdSwitchCmd) +
+ char *command = malloc(strlen (kdSwitchCmd) +
1 +
strlen (reason) +
1);
@@ -217,7 +217,7 @@ KdDoSwitchCmd (char *reason) strcat (command, " ");
strcat (command, reason);
system (command);
- xfree (command);
+ free(command);
}
}
@@ -701,7 +701,7 @@ KdAllocatePrivates (ScreenPtr pScreen) if (kdGeneration != serverGeneration)
kdGeneration = serverGeneration;
- pScreenPriv = xcalloc(1, sizeof (*pScreenPriv));
+ pScreenPriv = calloc(1, sizeof (*pScreenPriv));
if (!pScreenPriv)
return FALSE;
KdSetScreenPriv (pScreen, pScreenPriv);
@@ -790,7 +790,7 @@ KdCloseScreen (int index, ScreenPtr pScreen) pScreenPriv->screen->pScreen = 0;
- xfree ((pointer) pScreenPriv);
+ free((pointer) pScreenPriv);
return ret;
}
|