diff options
| author | Eric Anholt <eric@anholt.net> | 2010-06-04 16:04:37 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-06-06 15:56:35 -0700 |
| commit | 2c1fda08e889cad07acb452230da06f9c383d21c (patch) | |
| tree | 365ebf1e27b2a2ac784ab469d109d86e2edf6597 /uxa/uxa-glyphs.c | |
| parent | b586624d4f2908d2a998ba87fe0ae31c10f46b91 (diff) | |
Use libc instead of deprecated libc wrappers for malloc/calloc/free.
Diffstat (limited to 'uxa/uxa-glyphs.c')
| -rw-r--r-- | uxa/uxa-glyphs.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/uxa/uxa-glyphs.c b/uxa/uxa-glyphs.c index 9e596584..fde40287 100644 --- a/uxa/uxa-glyphs.c +++ b/uxa/uxa-glyphs.c @@ -110,7 +110,7 @@ static void uxa_unrealize_glyph_caches(ScreenPtr pScreen) FreePicture(cache->picture, 0); if (cache->glyphs) - xfree(cache->glyphs); + free(cache->glyphs); } } @@ -171,7 +171,7 @@ static Bool uxa_realize_glyph_caches(ScreenPtr pScreen) ValidatePicture(picture); cache->picture = picture; - cache->glyphs = xcalloc(sizeof(GlyphPtr), GLYPH_CACHE_SIZE); + cache->glyphs = calloc(sizeof(GlyphPtr), GLYPH_CACHE_SIZE); if (!cache->glyphs) goto bail; @@ -285,7 +285,7 @@ uxa_glyph_unrealize(ScreenPtr pScreen, priv->cache->glyphs[priv->pos] = NULL; uxa_glyph_set_private(pGlyph, NULL); - xfree(priv); + free(priv); } /* Cut and paste from render/glyph.c - probably should export it instead */ @@ -587,7 +587,7 @@ uxa_glyph_cache(ScreenPtr screen, GlyphPtr glyph, int *out_x, int *out_y) GlyphPtr evicted = cache->glyphs[pos + s]; if (evicted != NULL) { if (priv != NULL) - xfree(priv); + free(priv); priv = uxa_glyph_get_private(evicted); uxa_glyph_set_private(evicted, NULL); @@ -601,7 +601,7 @@ uxa_glyph_cache(ScreenPtr screen, GlyphPtr glyph, int *out_x, int *out_y) } if (priv == NULL) { - priv = xalloc(sizeof(struct uxa_glyph)); + priv = malloc(sizeof(struct uxa_glyph)); if (priv == NULL) return NULL; } |