diff options
| author | Eric Anholt <eric@anholt.net> | 2010-06-04 16:04:37 -0700 |
|---|---|---|
| committer | Owain G. Ainsworth <oga@openbsd.org> | 2010-06-07 21:06:49 +0100 |
| commit | ae9f6675da8663d3b2706c7975c6160fea23f676 (patch) | |
| tree | c703ed4ba9a6e53aa0ba705bc29b58473a4f4477 /src/i830_bios.c | |
| parent | 8e7aaa46ce788c7661654868659894a42efb836d (diff) | |
Use libc instead of deprecated libc wrappers for malloc/calloc/free.
Signed-off-by: Owain G. Ainsworth <oga@openbsd.org>
(cherrypick of part of this commit came from
2c1fda08e889cad07acb452230da06f9c383d21c by eric anholt)
Diffstat (limited to 'src/i830_bios.c')
| -rw-r--r-- | src/i830_bios.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/i830_bios.c b/src/i830_bios.c index b7262c79..da77cd43 100644 --- a/src/i830_bios.c +++ b/src/i830_bios.c @@ -352,7 +352,7 @@ int i830_bios_init(ScrnInfoPtr scrn) "libpciaccess reported 0 rom size, guessing %dkB\n", size / 1024); } - bios = xalloc(size); + bios = malloc(size); if (bios == NULL) return -1; @@ -361,7 +361,7 @@ int i830_bios_init(ScrnInfoPtr scrn) xf86DrvMsg(scrn->scrnIndex, X_WARNING, "libpciaccess failed to read %dkB video BIOS: %s\n", size / 1024, strerror(-ret)); - xfree(bios); + free(bios); return -1; } @@ -369,7 +369,7 @@ int i830_bios_init(ScrnInfoPtr scrn) if (vbt_off >= size) { xf86DrvMsg(scrn->scrnIndex, X_ERROR, "Bad VBT offset: 0x%x\n", vbt_off); - xfree(bios); + free(bios); return -1; } @@ -377,7 +377,7 @@ int i830_bios_init(ScrnInfoPtr scrn) if (memcmp(vbt->signature, "$VBT", 4) != 0) { xf86DrvMsg(scrn->scrnIndex, X_ERROR, "Bad VBT signature\n"); - xfree(bios); + free(bios); return -1; } @@ -390,7 +390,7 @@ int i830_bios_init(ScrnInfoPtr scrn) parse_driver_feature(intel, bdb); parse_sdvo_mapping(scrn, bdb); - xfree(bios); + free(bios); return 0; } |