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_uxa.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_uxa.c')
| -rw-r--r-- | src/i830_uxa.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/i830_uxa.c b/src/i830_uxa.c index ef0f7ee1..6ac2f431 100644 --- a/src/i830_uxa.c +++ b/src/i830_uxa.c @@ -617,7 +617,7 @@ void i830_set_pixmap_bo(PixmapPtr pixmap, dri_bo * bo) int ret; if (priv == NULL) { - priv = xcalloc(1, sizeof (struct intel_pixmap)); + priv = calloc(1, sizeof (struct intel_pixmap)); if (priv == NULL) goto BAIL; @@ -638,7 +638,7 @@ void i830_set_pixmap_bo(PixmapPtr pixmap, dri_bo * bo) } } else { if (priv != NULL) { - xfree(priv); + free(priv); priv = NULL; } } @@ -1000,7 +1000,7 @@ i830_uxa_create_pixmap(ScreenPtr screen, int w, int h, int depth, } } - priv = xcalloc(1, sizeof (struct intel_pixmap)); + priv = calloc(1, sizeof (struct intel_pixmap)); if (priv == NULL) { fbDestroyPixmap(pixmap); return NullPixmap; @@ -1014,7 +1014,7 @@ i830_uxa_create_pixmap(ScreenPtr screen, int w, int h, int depth, "pixmap", size, 0); if (!priv->bo) { - xfree(priv); + free(priv); fbDestroyPixmap(pixmap); if (errno == EFBIG) return fbCreatePixmap(screen, w, h, depth, usage); @@ -1133,7 +1133,7 @@ Bool i830_uxa_init(ScreenPtr screen) if (!uxa_driver_init(screen, intel->uxa_driver)) { xf86DrvMsg(scrn->scrnIndex, X_ERROR, "UXA initialization failed\n"); - xfree(intel->uxa_driver); + free(intel->uxa_driver); return FALSE; } |