From d871f19c3074f37df65b6d304f4eacbe19c4b46c Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Thu, 1 Dec 2005 16:33:51 +0000 Subject: [PATCH] use g_slic_* for all object allocations. Thu Dec 1 12:53:26 2005 Tim Janik * gtype.c: use g_slic_* for all object allocations. --- gobject/ChangeLog | 4 ++++ gobject/gtype.c | 10 ++-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/gobject/ChangeLog b/gobject/ChangeLog index 1dd51cc56..d8e455577 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,7 @@ +Thu Dec 1 12:53:26 2005 Tim Janik + + * gtype.c: use g_slic_* for all object allocations. + 2005-11-28 Matthias Clasen * gobjectnotifyqueue.c (g_object_notify_queue_thaw): diff --git a/gobject/gtype.c b/gobject/gtype.c index 3d312b237..95518f119 100644 --- a/gobject/gtype.c +++ b/gobject/gtype.c @@ -1544,10 +1544,7 @@ g_type_create_instance (GType type) class = g_type_class_ref (type); total_size = type_total_instance_size_I (node); - if (node->data->instance.n_preallocs) - instance = g_slice_alloc0 (total_size); - else - instance = g_malloc0 (total_size); + instance = g_slice_alloc0 (total_size); if (node->data->instance.private_size) instance_real_class_set (instance, class); @@ -1600,10 +1597,7 @@ g_type_free_instance (GTypeInstance *instance) #ifdef G_ENABLE_DEBUG memset (instance, 0xaa, type_total_instance_size_I (node)); #endif - if (node->data->instance.n_preallocs) - g_slice_free1 (type_total_instance_size_I (node), instance); - else - g_free (instance); + g_slice_free1 (type_total_instance_size_I (node), instance); g_type_class_unref (class); }