diff options
| author | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:35:28 -0400 |
|---|---|---|
| committer | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:35:28 -0400 |
| commit | ba50031707469046407a35b77a3cd81351e951b3 (patch) | |
| tree | 5c03e723bdbfabae09d41a3ab1253dff41eeed4a /Zend/zend_objects.c | |
| parent | 0a36161e13484a99ccf69bb38f206462d27cc6d6 (diff) | |
| download | php-upstream/5.1.5.tar.gz | |
Imported Upstream version 5.1.5upstream/5.1.5
Diffstat (limited to 'Zend/zend_objects.c')
| -rw-r--r-- | Zend/zend_objects.c | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c index e2cffc3d2..5417f8c7f 100644 --- a/Zend/zend_objects.c +++ b/Zend/zend_objects.c @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_objects.c,v 1.56.2.2 2006/01/04 23:53:04 andi Exp $ */ +/* $Id: zend_objects.c,v 1.56.2.3 2006/03/29 14:28:40 tony2001 Exp $ */ #include "zend.h" #include "zend_globals.h" @@ -25,6 +25,26 @@ #include "zend_API.h" #include "zend_interfaces.h" +ZEND_API void zend_object_std_init(zend_object *object, zend_class_entry *ce TSRMLS_DC) +{ + ALLOC_HASHTABLE(object->properties); + zend_hash_init(object->properties, 0, NULL, ZVAL_PTR_DTOR, 0); + + object->ce = ce; + object->guards = NULL; +} + +ZEND_API void zend_object_std_dtor(zend_object *object TSRMLS_DC) +{ + if (object->guards) { + zend_hash_destroy(object->guards); + FREE_HASHTABLE(object->guards); + } + if (object->properties) { + zend_hash_destroy(object->properties); + FREE_HASHTABLE(object->properties); + } +} ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handle handle TSRMLS_DC) { @@ -88,12 +108,7 @@ ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handl ZEND_API void zend_objects_free_object_storage(zend_object *object TSRMLS_DC) { - if (object->guards) { - zend_hash_destroy(object->guards); - FREE_HASHTABLE(object->guards); - } - zend_hash_destroy(object->properties); - FREE_HASHTABLE(object->properties); + zend_object_std_dtor(object TSRMLS_CC); efree(object); } |