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:
@@ -431,7 +431,7 @@ TimerSet(OsTimerPtr timer, int flags, CARD32 millis,
|
||||
|
||||
if (!timer)
|
||||
{
|
||||
timer = xalloc(sizeof(struct _OsTimerRec));
|
||||
timer = malloc(sizeof(struct _OsTimerRec));
|
||||
if (!timer)
|
||||
return NULL;
|
||||
}
|
||||
@@ -516,7 +516,7 @@ TimerFree(OsTimerPtr timer)
|
||||
if (!timer)
|
||||
return;
|
||||
TimerCancel(timer);
|
||||
xfree(timer);
|
||||
free(timer);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -536,7 +536,7 @@ TimerInit(void)
|
||||
while ((timer = timers))
|
||||
{
|
||||
timers = timer->next;
|
||||
xfree(timer);
|
||||
free(timer);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user