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_bios.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_bios.c')
| -rw-r--r-- | src/radeon_bios.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/radeon_bios.c b/src/radeon_bios.c index d066edce..7d615c06 100644 --- a/src/radeon_bios.c +++ b/src/radeon_bios.c @@ -361,9 +361,9 @@ RADEONGetBIOSInfo(ScrnInfoPtr pScrn, xf86Int10InfoPtr pInt10) #ifdef XSERVER_LIBPCIACCESS int size = info->PciInfo->rom_size > RADEON_VBIOS_SIZE ? info->PciInfo->rom_size : RADEON_VBIOS_SIZE; - info->VBIOS = xalloc(size); + info->VBIOS = malloc(size); #else - info->VBIOS = xalloc(RADEON_VBIOS_SIZE); + info->VBIOS = malloc(RADEON_VBIOS_SIZE); #endif if (!info->VBIOS) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, @@ -381,7 +381,7 @@ RADEONGetBIOSInfo(ScrnInfoPtr pScrn, xf86Int10InfoPtr pInt10) if (info->VBIOS[0] != 0x55 || info->VBIOS[1] != 0xaa) { xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Unrecognized BIOS signature, BIOS data will not be used\n"); - xfree (info->VBIOS); + free (info->VBIOS); info->VBIOS = NULL; return FALSE; } @@ -396,7 +396,7 @@ RADEONGetBIOSInfo(ScrnInfoPtr pScrn, xf86Int10InfoPtr pInt10) else if (info->VBIOS[dptr + 0x14] != 0x0) { xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Not an x86 BIOS ROM image, BIOS data will not be used\n"); - xfree (info->VBIOS); + free (info->VBIOS); info->VBIOS = NULL; return FALSE; } @@ -406,7 +406,7 @@ RADEONGetBIOSInfo(ScrnInfoPtr pScrn, xf86Int10InfoPtr pInt10) if(!info->ROMHeaderStart) { xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Invalid ROM pointer, BIOS data will not be used\n"); - xfree (info->VBIOS); + free (info->VBIOS); info->VBIOS = NULL; return FALSE; } |