diff options
| author | Michel Dänzer <daenzer@vmware.com> | 2010-06-14 08:52:16 +0200 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2010-06-21 08:18:15 +0200 |
| commit | f7a91ece264af9f3fd2fc18e99aefcda93ce9f5c (patch) | |
| tree | dd5748ed2b94a860be6e66070e2c025cc9febad0 /src/radeon_exa.c | |
| parent | ea37d24b1b6d4cbcf73e680846de25b72af216e3 (diff) | |
Convert x(c)alloc/xfree to m/calloc/free.
Fixes deprecation warnings with xserver master and should also work with older
xservers.
Diffstat (limited to 'src/radeon_exa.c')
| -rw-r--r-- | src/radeon_exa.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/radeon_exa.c b/src/radeon_exa.c index 4f974c35..d7fba656 100644 --- a/src/radeon_exa.c +++ b/src/radeon_exa.c @@ -372,7 +372,7 @@ void *RADEONEXACreatePixmap(ScreenPtr pScreen, int size, int align) } #endif - new_priv = xcalloc(1, sizeof(struct radeon_exa_pixmap_priv)); + new_priv = calloc(1, sizeof(struct radeon_exa_pixmap_priv)); if (!new_priv) return NULL; @@ -382,7 +382,7 @@ void *RADEONEXACreatePixmap(ScreenPtr pScreen, int size, int align) new_priv->bo = radeon_bo_open(info->bufmgr, 0, size, align, RADEON_GEM_DOMAIN_VRAM, 0); if (!new_priv->bo) { - xfree(new_priv); + free(new_priv); ErrorF("Failed to alloc memory\n"); return NULL; } @@ -471,7 +471,7 @@ void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height, padded_width = RADEON_ALIGN(padded_width, pixmap_align); size = height * padded_width; - new_priv = xcalloc(1, sizeof(struct radeon_exa_pixmap_priv)); + new_priv = calloc(1, sizeof(struct radeon_exa_pixmap_priv)); if (!new_priv) return NULL; @@ -483,7 +483,7 @@ void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height, new_priv->bo = radeon_bo_open(info->bufmgr, 0, size, 0, RADEON_GEM_DOMAIN_VRAM, 0); if (!new_priv->bo) { - xfree(new_priv); + free(new_priv); ErrorF("Failed to alloc memory\n"); return NULL; } @@ -503,7 +503,7 @@ void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv) if (driver_priv->bo) radeon_bo_unref(driver_priv->bo); - xfree(driverPriv); + free(driverPriv); } struct radeon_bo *radeon_get_pixmap_bo(PixmapPtr pPix) |