summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2005-06-03 16:16:44 +0000
committerCarl Worth <cworth@cworth.org>2005-06-03 16:16:44 +0000
commit756e991b91465c6da933368d66f19e54849815dd (patch)
tree7f3a1b67e98fa7eeab2d32b5e72ea5ca53adb705
parent42c1fb7c918ceb7920ddc8b6b75b38fd757d3a06 (diff)
Fix name of _cairo_user_data_array_destroy to be _cairo_user_data_array_fini.
-rw-r--r--ChangeLog8
-rw-r--r--src/cairo-array.c6
-rw-r--r--src/cairo-font.c2
-rw-r--r--src/cairo-surface.c2
-rw-r--r--src/cairoint.h2
5 files changed, 14 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 50d200917..d35e02f34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2005-06-03 Carl Worth <cworth@cworth.org>
+ * 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.
+
+2005-06-03 Carl Worth <cworth@cworth.org>
+
* src/cairo-glitz-surface.c:
(_cairo_glitz_glyph_cache_create_entry),
(_cairo_glitz_glyph_cache_destroy_entry),
diff --git a/src/cairo-array.c b/src/cairo-array.c
index a37ea9af5..a9f148a07 100644
--- a/src/cairo-array.c
+++ b/src/cairo-array.c
@@ -147,7 +147,7 @@ typedef struct {
*
* 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_init (cairo_user_data_array_t *array)
}
/**
- * _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;
diff --git a/src/cairo-font.c b/src/cairo-font.c
index 2135ae05b..b40598f11 100644
--- a/src/cairo-font.c
+++ b/src/cairo-font.c
@@ -88,7 +88,7 @@ cairo_font_face_destroy (cairo_font_face_t *font_face)
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);
}
diff --git a/src/cairo-surface.c b/src/cairo-surface.c
index 69c1ee6c9..40fe36426 100644
--- a/src/cairo-surface.c
+++ b/src/cairo-surface.c
@@ -138,7 +138,7 @@ cairo_surface_destroy (cairo_surface_t *surface)
cairo_surface_finish (surface);
- _cairo_user_data_array_destroy (&surface->user_data);
+ _cairo_user_data_array_fini (&surface->user_data);
free (surface);
}
diff --git a/src/cairoint.h b/src/cairoint.h
index fae539f15..b9b8b8309 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -289,7 +289,7 @@ cairo_private void
_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,