[cairo-commit] cairo/src cairo-ft-font.c,1.91,1.92

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv9871/src

Modified Files:
	cairo-ft-font.c 
Log Message:

2005-08-05  Carl Worth  <cworth at cworth.org>

        * src/cairo-ft-font.c: (_cairo_ft_font_face_destroy),
        (_cairo_ft_font_face_create): Rename cairo_ft_font_face->next_face
        to next.


Index: cairo-ft-font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-ft-font.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- cairo-ft-font.c	6 Aug 2005 03:53:09 -0000	1.91
+++ cairo-ft-font.c	6 Aug 2005 05:35:04 -0000	1.92
@@ -116,7 +116,7 @@
     cairo_font_face_t base;
     cairo_ft_unscaled_font_t *unscaled;
     int load_flags;
-    cairo_ft_font_face_t *next_face;
+    cairo_ft_font_face_t *next;
 };
 
 const cairo_unscaled_font_backend_t cairo_ft_unscaled_font_backend;
@@ -2078,12 +2078,15 @@
     
     if (font_face->unscaled) {
 	/* Remove face from linked list */
-	for (tmp_face = font_face->unscaled->faces; tmp_face; tmp_face = tmp_face->next_face) {
+	for (tmp_face = font_face->unscaled->faces;
+	     tmp_face;
+	     tmp_face = tmp_face->next)
+	{
 	    if (tmp_face == font_face) {
 		if (last_face)
-		    last_face->next_face = tmp_face->next_face;
+		    last_face->next = tmp_face->next;
 		else
-		    font_face->unscaled->faces = tmp_face->next_face;
+		    font_face->unscaled->faces = tmp_face->next;
 	    }
 	    
 	    last_face = tmp_face;
@@ -2139,7 +2142,10 @@
     cairo_ft_font_face_t *font_face;
 
     /* Looked for an existing matching font face */
-    for (font_face = unscaled->faces; font_face; font_face = font_face->next_face) {
+    for (font_face = unscaled->faces;
+	 font_face;
+	 font_face = font_face->next)
+    {
 	if (font_face->load_flags == load_flags)
 	    return cairo_font_face_reference (&font_face->base);
     }
@@ -2154,7 +2160,7 @@
     
     font_face->load_flags = load_flags;
 
-    font_face->next_face = unscaled->faces;
+    font_face->next = unscaled->faces;
     unscaled->faces = font_face;
     
     _cairo_font_face_init (&font_face->base, &_ft_font_face_backend);