[PATCH 2/2] Remove some dead code

Uli Schlachter psychon at znc.in
Tue May 1 05:48:43 PDT 2012


This code could never be executed, because the status variable doesn't get set
since the last time it is checked and errors get returned to the caller.

This was noticed while looking into the build log provided by
http://lists.cairographics.org/archives/cairo/2012-April/022993.html

Reported-by: Ryan Schmidt <cairo-2012b at ryandesign.com>
Signed-off-by: Uli Schlachter <psychon at znc.in>
---
 src/cairo-scaled-font-subsets.c |    5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/cairo-scaled-font-subsets.c b/src/cairo-scaled-font-subsets.c
index 355245a..e78e0c2 100644
--- a/src/cairo-scaled-font-subsets.c
+++ b/src/cairo-scaled-font-subsets.c
@@ -522,11 +522,6 @@ _cairo_sub_font_add_glyph (cairo_sub_font_t	   *sub_font,
     y_advance = scaled_glyph->metrics.y_advance;
     _cairo_scaled_font_thaw_cache (sub_font->scaled_font);
 
-    if (unlikely (status)) {
-	_cairo_sub_font_glyph_destroy (sub_font_glyph);
-	return status;
-    }
-
     if (!is_latin && sub_font->num_glyphs_in_current_subset == sub_font->max_glyphs_per_subset)
     {
 	sub_font->current_subset++;
-- 
1.7.10


--------------070802020000050305050502--


More information about the cairo mailing list