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:
@@ -142,7 +142,7 @@ extern _X_EXPORT RegDataRec miBrokenData;
|
||||
{ \
|
||||
(_pReg)->extents = miEmptyBox; \
|
||||
if (((_size) > 1) && ((_pReg)->data = \
|
||||
(RegDataPtr)xalloc(REGION_SZOF(_size)))) \
|
||||
(RegDataPtr)malloc(REGION_SZOF(_size)))) \
|
||||
{ \
|
||||
(_pReg)->data->size = (_size); \
|
||||
(_pReg)->data->numRects = 0; \
|
||||
@@ -156,7 +156,7 @@ extern _X_EXPORT RegDataRec miBrokenData;
|
||||
#define REGION_UNINIT(_pScreen, _pReg) \
|
||||
{ \
|
||||
if ((_pReg)->data && (_pReg)->data->size) { \
|
||||
xfree((_pReg)->data); \
|
||||
free((_pReg)->data); \
|
||||
(_pReg)->data = NULL; \
|
||||
} \
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user