diff options
| author | Mikhail Gusarov <dottedmag@dottedmag.net> | 2010-05-06 01:44:06 +0700 |
|---|---|---|
| committer | Mikhail Gusarov <dottedmag@dottedmag.net> | 2010-05-13 00:22:37 +0700 |
| commit | 3f3ff971ecff9936cebafc813af9193b97bba89c (patch) | |
| tree | fdbbad794a42488b7ffe41eed7aba4e498335f55 /dix/swaprep.c | |
| parent | 96c7ab27c383ec767f62a7a11e5fd76f86363fbc (diff) | |
Replace X-allocation functions with their C89 counterparts
The only remaining X-functions used in server are XNF*, the rest is converted to
plain alloc/calloc/realloc/free/strdup.
X* functions are still exported from server and x* macros are still defined in
header file, so both ABI and API are not affected by this change.
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'dix/swaprep.c')
| -rw-r--r-- | dix/swaprep.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/dix/swaprep.c b/dix/swaprep.c index 12c6dbd26..c173411ab 100644 --- a/dix/swaprep.c +++ b/dix/swaprep.c @@ -99,7 +99,7 @@ CopySwap32Write(ClientPtr pClient, int size, CARD32 *pbuf) CARD32 tmpbuf[1]; /* Allocate as big a buffer as we can... */ - while (!(pbufT = xalloc(bufsize))) + while (!(pbufT = malloc(bufsize))) { bufsize >>= 1; if (bufsize == 4) @@ -131,7 +131,7 @@ CopySwap32Write(ClientPtr pClient, int size, CARD32 *pbuf) } if (pbufT != tmpbuf) - xfree (pbufT); + free(pbufT); } /** @@ -147,7 +147,7 @@ CopySwap16Write(ClientPtr pClient, int size, short *pbuf) short tmpbuf[2]; /* Allocate as big a buffer as we can... */ - while (!(pbufT = xalloc(bufsize))) + while (!(pbufT = malloc(bufsize))) { bufsize >>= 1; if (bufsize == 4) @@ -179,7 +179,7 @@ CopySwap16Write(ClientPtr pClient, int size, short *pbuf) } if (pbufT != tmpbuf) - xfree (pbufT); + free(pbufT); } @@ -1262,7 +1262,7 @@ WriteSConnectionInfo(ClientPtr pClient, unsigned long size, char *pInfo) { char *pInfoTBase; - pInfoTBase = xalloc(size); + pInfoTBase = malloc(size); if (!pInfoTBase) { pClient->noClientException = -1; @@ -1270,7 +1270,7 @@ WriteSConnectionInfo(ClientPtr pClient, unsigned long size, char *pInfo) } SwapConnSetupInfo(pInfo, pInfoTBase); (void)WriteToClient(pClient, (int)size, (char *) pInfoTBase); - xfree(pInfoTBase); + free(pInfoTBase); } void |