From: Andi Gutmans Date: Sat, 15 Jun 2002 08:47:11 +0000 (+0000) Subject: - Fix copy&paste problem where we allocated according to an old structure X-Git-Tag: php5_5_0~11 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e8fe69884f8b87484d980a0aff5b13d4f4845515;p=php - Fix copy&paste problem where we allocated according to an old structure - decleration and not the new one. --- diff --git a/Zend/zend_objects.h b/Zend/zend_objects.h index f173e1195d..22cfaf7ee5 100644 --- a/Zend/zend_objects.h +++ b/Zend/zend_objects.h @@ -3,27 +3,6 @@ #include "zend.h" -typedef struct _zend_object_bucket { - zend_bool valid; - zend_bool destructor_called; - union _bucket { - struct { - zend_object object; - zend_uint refcount; - } obj; - struct { - int next; - } free_list; - } bucket; -} zend_object_bucket; - -typedef struct _zend_objects { - zend_object_bucket *object_buckets; - zend_uint top; - zend_uint size; - int free_list_head; -} zend_objects; - zend_object_value zend_objects_new(zend_object **object, zend_class_entry *class_type); zend_object *zend_objects_get_address(zval *object); zend_object_value zend_objects_clone_obj(zval *object TSRMLS_DC); diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c index 09108cb8c8..e37e827486 100644 --- a/Zend/zend_objects_API.c +++ b/Zend/zend_objects_API.c @@ -8,7 +8,7 @@ void zend_objects_store_init(zend_objects_store *objects, zend_uint init_size) { - objects->object_buckets = (zend_object_store_bucket *) emalloc(init_size * sizeof(zend_object_bucket)); + objects->object_buckets = (zend_object_store_bucket *) emalloc(init_size * sizeof(zend_object_store_bucket)); objects->top = 1; /* Skip 0 so that handles are true */ objects->size = init_size; objects->free_list_head = -1;