diff options
| author | Mikhail Gusarov <dottedmag@dottedmag.net> | 2010-05-06 01:44:06 +0700 |
|---|---|---|
| committer | Mikhail Gusarov <dottedmag@dottedmag.net> | 2010-05-13 00:22:37 +0700 |
| commit | 3f3ff971ecff9936cebafc813af9193b97bba89c (patch) | |
| tree | fdbbad794a42488b7ffe41eed7aba4e498335f55 /fb/fbscreen.c | |
| parent | 96c7ab27c383ec767f62a7a11e5fd76f86363fbc (diff) | |
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>
Diffstat (limited to 'fb/fbscreen.c')
| -rw-r--r-- | fb/fbscreen.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fb/fbscreen.c b/fb/fbscreen.c index 53e2ada9f..9b789b0a8 100644 --- a/fb/fbscreen.c +++ b/fb/fbscreen.c @@ -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, |