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:
@@ -160,7 +160,7 @@ XFixesSelectSelectionInput (ClientPtr pClient,
|
||||
}
|
||||
if (!e)
|
||||
{
|
||||
e = (SelectionEventPtr) xalloc (sizeof (SelectionEventRec));
|
||||
e = (SelectionEventPtr) malloc(sizeof (SelectionEventRec));
|
||||
if (!e)
|
||||
return BadAlloc;
|
||||
|
||||
@@ -181,7 +181,7 @@ XFixesSelectSelectionInput (ClientPtr pClient,
|
||||
if (!AddResource (pWindow->drawable.id, SelectionWindowType,
|
||||
(pointer) pWindow))
|
||||
{
|
||||
xfree (e);
|
||||
free(e);
|
||||
return BadAlloc;
|
||||
}
|
||||
|
||||
@@ -256,7 +256,7 @@ SelectionFreeClient (pointer data, XID id)
|
||||
if (e == old)
|
||||
{
|
||||
*prev = e->next;
|
||||
xfree (e);
|
||||
free(e);
|
||||
CheckSelectionCallback ();
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user