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 /Xext/xvmain.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 'Xext/xvmain.c')
| -rw-r--r-- | Xext/xvmain.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Xext/xvmain.c b/Xext/xvmain.c index 05a68907a..13cd600a1 100644 --- a/Xext/xvmain.c +++ b/Xext/xvmain.c @@ -277,7 +277,7 @@ XvScreenInit(ScreenPtr pScreen) /* ALLOCATE SCREEN PRIVATE RECORD */ - pxvs = xalloc (sizeof (XvScreenRec)); + pxvs = malloc(sizeof (XvScreenRec)); if (!pxvs) { ErrorF("XvScreenInit: Unable to allocate screen private structure\n"); @@ -314,7 +314,7 @@ XvCloseScreen( (* pxvs->ddCloseScreen)(ii, pScreen); - xfree(pxvs); + free(pxvs); dixSetPrivate(&pScreen->devPrivates, XvScreenKey, NULL); @@ -509,7 +509,7 @@ XvdiDestroyVideoNotifyList(pointer pn, XID id) { npn = cpn->next; if (cpn->client) FreeResource(cpn->id, XvRTVideoNotify); - xfree(cpn); + free(cpn); cpn = npn; } return Success; @@ -928,12 +928,12 @@ XvdiSelectVideoNotify( if (!pn) { - if (!(tpn = xalloc(sizeof(XvVideoNotifyRec)))) + if (!(tpn = malloc(sizeof(XvVideoNotifyRec)))) return BadAlloc; tpn->next = NULL; if (!AddResource(pDraw->id, XvRTVideoNotifyList, tpn)) { - xfree(tpn); + free(tpn); return BadAlloc; } } @@ -966,7 +966,7 @@ XvdiSelectVideoNotify( } else { - if (!(tpn = xalloc(sizeof(XvVideoNotifyRec)))) + if (!(tpn = malloc(sizeof(XvVideoNotifyRec)))) return BadAlloc; tpn->next = pn->next; pn->next = tpn; @@ -1024,7 +1024,7 @@ XvdiSelectPortNotify( if (!tpn) { - if (!(tpn = xalloc(sizeof(XvPortNotifyRec)))) + if (!(tpn = malloc(sizeof(XvPortNotifyRec)))) return BadAlloc; tpn->next = pPort->pNotify; pPort->pNotify = tpn; |