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:
@@ -33,12 +33,12 @@ fbCloseScreen (int index, ScreenPtr pScreen)
|
||||
DepthPtr depths = pScreen->allowedDepths;
|
||||
|
||||
for (d = 0; d < pScreen->numDepths; d++)
|
||||
xfree (depths[d].vids);
|
||||
xfree (depths);
|
||||
xfree (pScreen->visuals);
|
||||
xfree (pScreen->devPrivate);
|
||||
free(depths[d].vids);
|
||||
free(depths);
|
||||
free(pScreen->visuals);
|
||||
free(pScreen->devPrivate);
|
||||
#ifdef FB_SCREEN_PRIVATE
|
||||
xfree (dixLookupPrivate(&pScreen->devPrivates, fbGetScreenPrivateKey()));
|
||||
free(dixLookupPrivate(&pScreen->devPrivates, fbGetScreenPrivateKey()));
|
||||
#endif
|
||||
return TRUE;
|
||||
}
|
||||
@@ -229,8 +229,8 @@ fbFinishScreenInit(ScreenPtr pScreen,
|
||||
if (!fbInitVisuals (&visuals, &depths, &nvisuals, &ndepths, &rootdepth,
|
||||
&defaultVisual,((unsigned long)1<<(imagebpp-1)), 8))
|
||||
{
|
||||
xfree (visuals);
|
||||
xfree (depths);
|
||||
free(visuals);
|
||||
free(depths);
|
||||
return FALSE;
|
||||
}
|
||||
if (! miScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width,
|
||||
|
||||
Reference in New Issue
Block a user