[cairo-commit] cairo/src cairo-array.c, 1.3, 1.4 cairo-font.c, 1.47, 1.48 cairo-surface.c, 1.70, 1.71 cairoint.h, 1.146, 1.147

[Carl Worth]

Committed by: cworth

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

Modified Files:
	cairo-array.c cairo-font.c cairo-surface.c cairoint.h 
Log Message:

        * src/cairoint.h:
        * src/cairo-array.c: (_cairo_user_data_array_fini):
        * src/cairo-font.c: (cairo_font_face_destroy):
        * src/cairo-surface.c: (cairo_surface_destroy): Fix name of
        _cairo_user_data_array_destroy to be _cairo_user_data_array_fini.


Index: cairo-array.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-array.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cairo-array.c	8 Apr 2005 20:14:17 -0000	1.3
+++ cairo-array.c	3 Jun 2005 23:16:44 -0000	1.4
@@ -147,7 +147,7 @@
  * 
  * Initializes a #cairo_user_data_array_t structure for future
  * use. After initialization, the array has no keys. Call
- * _cairo_user_data_array_destroy() to free any allocated memory
+ * _cairo_user_data_array_fini() to free any allocated memory
  * when done using the array.
  **/
 void
@@ -157,14 +157,14 @@
 }
 
 /**
- * _cairo_user_data_array_destroy:
+ * _cairo_user_data_array_fini:
  * @array: a #cairo_user_data_array_t
  * 
  * Destroys all current keys in the user data array and deallocates
  * any memory allocated for the array itself.
  **/
 void
-_cairo_user_data_array_destroy (cairo_user_data_array_t *array)
+_cairo_user_data_array_fini (cairo_user_data_array_t *array)
 {
     int i, num_slots;
     cairo_user_data_slot_t *slots;

Index: cairo-font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-font.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- cairo-font.c	1 Jun 2005 20:24:10 -0000	1.47
+++ cairo-font.c	3 Jun 2005 23:16:44 -0000	1.48
@@ -88,7 +88,7 @@
     if (font_face->refcount > 0)
 	return;
 
-    _cairo_user_data_array_destroy (&font_face->user_data);
+    _cairo_user_data_array_fini (&font_face->user_data);
 
     free (font_face);
 }

Index: cairo-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-surface.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- cairo-surface.c	1 Jun 2005 20:24:10 -0000	1.70
+++ cairo-surface.c	3 Jun 2005 23:16:44 -0000	1.71
@@ -138,7 +138,7 @@
 
     cairo_surface_finish (surface);
 
-    _cairo_user_data_array_destroy (&surface->user_data);
+    _cairo_user_data_array_fini (&surface->user_data);
 
     free (surface);
 }

Index: cairoint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairoint.h,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- cairoint.h	3 Jun 2005 16:38:39 -0000	1.146
+++ cairoint.h	3 Jun 2005 23:16:44 -0000	1.147
@@ -289,7 +289,7 @@
 _cairo_user_data_array_init (cairo_user_data_array_t *array);
 
 cairo_private void
-_cairo_user_data_array_destroy (cairo_user_data_array_t *array);
+_cairo_user_data_array_fini (cairo_user_data_array_t *array);
 
 cairo_private void *
 _cairo_user_data_array_get_data (cairo_user_data_array_t     *array,