Jelajahi Sumber

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."
Hiltjo Posthuma 6 tahun lalu
induk
melakukan
ed68fe7dce
1 mengubah file dengan 2 tambahan dan 7 penghapusan
  1. 2 7
      x.c

+ 2 - 7
x.c

@@ -1243,15 +1243,10 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
 			fontpattern = FcFontSetMatch(0, fcsets, 1,
 					fcpattern, &fcres);
 
-			/*
-			 * Allocate memory for the new cache entry.
-			 */
+			/* Allocate memory for the new cache entry. */
 			if (frclen >= frccap) {
 				frccap += 16;
-				if (!frc)
-					frc = xmalloc(frccap * sizeof(Fontcache));
-				else
-					frc = xrealloc(frc, frccap * sizeof(Fontcache));
+				frc = xrealloc(frc, frccap * sizeof(Fontcache));
 			}
 
 			frc[frclen].font = XftFontOpenPattern(xw.dpy,