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>
This commit is contained in:
@@ -108,7 +108,7 @@ ProcRRSelectInput (ClientPtr client)
|
||||
if (!pRREvent)
|
||||
{
|
||||
/* build the entry */
|
||||
pRREvent = (RREventPtr) xalloc (sizeof (RREventRec));
|
||||
pRREvent = (RREventPtr) malloc(sizeof (RREventRec));
|
||||
if (!pRREvent)
|
||||
return BadAlloc;
|
||||
pRREvent->next = 0;
|
||||
@@ -131,7 +131,7 @@ ProcRRSelectInput (ClientPtr client)
|
||||
*/
|
||||
if (!pHead)
|
||||
{
|
||||
pHead = (RREventPtr *) xalloc (sizeof (RREventPtr));
|
||||
pHead = (RREventPtr *) malloc(sizeof (RREventPtr));
|
||||
if (!pHead ||
|
||||
!AddResource (pWin->drawable.id, RREventType, (pointer)pHead))
|
||||
{
|
||||
@@ -174,7 +174,7 @@ ProcRRSelectInput (ClientPtr client)
|
||||
pNewRREvent->next = pRREvent->next;
|
||||
else
|
||||
*pHead = pRREvent->next;
|
||||
xfree (pRREvent);
|
||||
free(pRREvent);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user