summaryrefslogtreecommitdiff
path: root/exa/exa_glyphs.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2010-06-11 10:08:13 -0700
committerKeith Packard <keithp@keithp.com>2010-06-11 10:08:13 -0700
commita41d6e9bffbe56cfa1c3b84388a3d9f5a982f1a9 (patch)
tree35bd9d1971fe0dd7d4b94cb90aadcfa12c57f574 /exa/exa_glyphs.c
parent7e8f1001217326cc451974bacf25275420c4bb4e (diff)
parentf4190feb25ecc3d8278decc8bf28a5ef0e568942 (diff)
Merge remote branch 'dottedmag/for-keithp'
Diffstat (limited to 'exa/exa_glyphs.c')
-rw-r--r--exa/exa_glyphs.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/exa/exa_glyphs.c b/exa/exa_glyphs.c
index b09db46b0..5c46ec901 100644
--- a/exa/exa_glyphs.c
+++ b/exa/exa_glyphs.c
@@ -127,15 +127,11 @@ exaUnrealizeGlyphCaches(ScreenPtr pScreen,
cache->picture = NULL;
}
- if (cache->hashEntries) {
- free(cache->hashEntries);
- cache->hashEntries = NULL;
- }
+ free(cache->hashEntries);
+ cache->hashEntries = NULL;
- if (cache->glyphs) {
- free(cache->glyphs);
- cache->glyphs = NULL;
- }
+ free(cache->glyphs);
+ cache->glyphs = NULL;
cache->glyphCount = 0;
}
}