diff options
| author | Hiltjo Posthuma <hiltjo@codemadness.org> | 2019-03-03 11:29:43 +0100 |
|---|---|---|
| committer | Hiltjo Posthuma <hiltjo@codemadness.org> | 2019-03-03 11:29:43 +0100 |
| commit | ed68fe7dce2b21b4e0e595b99d47790e76812cb7 (patch) | |
| tree | 6c4f4d051b479949642c661516780c025c8ce99c | |
| parent | 4e0135afeca43f5affe13d7269cb98e7ac526074 (diff) | |
| download | st-ed68fe7dce2b21b4e0e595b99d47790e76812cb7.tar.gz st-ed68fe7dce2b21b4e0e595b99d47790e76812cb7.zip | |
simplify (greedy) font caching allocating a bit
POSIX says:
"If ptr is a null pointer, realloc() shall be equivalent to malloc() for the
specified size."
| -rw-r--r-- | x.c | 9 |
1 files changed, 2 insertions, 7 deletions
| @@ -1243,15 +1243,10 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x | |||
| 1243 | fontpattern = FcFontSetMatch(0, fcsets, 1, | 1243 | fontpattern = FcFontSetMatch(0, fcsets, 1, |
| 1244 | fcpattern, &fcres); | 1244 | fcpattern, &fcres); |
| 1245 | 1245 | ||
| 1246 | /* | 1246 | /* Allocate memory for the new cache entry. */ |
| 1247 | * Allocate memory for the new cache entry. | ||
| 1248 | */ | ||
| 1249 | if (frclen >= frccap) { | 1247 | if (frclen >= frccap) { |
| 1250 | frccap += 16; | 1248 | frccap += 16; |
| 1251 | if (!frc) | 1249 | frc = xrealloc(frc, frccap * sizeof(Fontcache)); |
| 1252 | frc = xmalloc(frccap * sizeof(Fontcache)); | ||
| 1253 | else | ||
| 1254 | frc = xrealloc(frc, frccap * sizeof(Fontcache)); | ||
| 1255 | } | 1250 | } |
| 1256 | 1251 | ||
| 1257 | frc[frclen].font = XftFontOpenPattern(xw.dpy, | 1252 | frc[frclen].font = XftFontOpenPattern(xw.dpy, |
