API updates

diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
index b4bc3d980d1c2d2b7891f1fffed4cdfc087661cc..eda82e8f382b2750b39c14603a611be0c29c60b0 100755 (executable)
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
@@ -75,8 +75,8 @@ typedef struct _spl_array_object {
        HashPosition      pos;
 } spl_array_object;
 
-/* {{{ spl_array_object_dtor */
-static void spl_array_object_dtor(void *object, zend_object_handle handle TSRMLS_DC)
+/* {{{ spl_array_object_free_storage */
+static void spl_array_object_free_storage(void *object TSRMLS_DC)
 {
        spl_array_object *intern = (spl_array_object *)object;
 
@@ -114,7 +114,7 @@ static zend_object_value spl_array_object_new_ex(zend_class_entry *class_type, s
        }
        zend_hash_internal_pointer_reset_ex(HASH_OF(intern->array), &intern->pos);
 
-       retval.handle = zend_objects_store_put(intern, spl_array_object_dtor, NULL TSRMLS_CC);
+       retval.handle = zend_objects_store_put(intern, NULL, (zend_objects_free_object_storage_t) spl_array_object_free_storage, NULL TSRMLS_CC);
        if (class_type == spl_ce_ArrayIterator) {
                retval.handlers = &spl_handler_ArrayIterator;
        } else {

diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index 60ead5b240ea14904c538d3e6850acc1d8c2c9b8..04cd12b46c1565784d717737174f0c90a3d59297 100755 (executable)
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -50,9 +50,9 @@ zend_class_entry *spl_ce_DirectoryIterator;
 zend_class_entry *spl_ce_RecursiveDirectoryIterator;
 
 
-/* {{{ spl_ce_dir_object_dtor */
+/* {{{ spl_ce_dir_object_free_storage */
 /* close all resources and the memory allocated for the object */
-static void spl_ce_dir_object_dtor(void *object, zend_object_handle handle TSRMLS_DC)
+static void spl_ce_dir_object_free_storage(void *object TSRMLS_DC)
 {
        spl_ce_dir_object *intern = (spl_ce_dir_object *)object;
 
@@ -99,7 +99,7 @@ static zend_object_value spl_ce_dir_object_new_ex(zend_class_entry *class_type,
        zend_hash_init(intern->std.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
        zend_hash_copy(intern->std.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
 
-       retval.handle = zend_objects_store_put(intern, spl_ce_dir_object_dtor, NULL TSRMLS_CC);
+       retval.handle = zend_objects_store_put(intern, NULL, (zend_objects_free_object_storage_t) spl_ce_dir_object_free_storage, NULL TSRMLS_CC);
        retval.handlers = &spl_ce_dir_handlers;
        return retval;
 }

diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index 2fe08bc0cbbbe2952ea1aca38b9c04139101fb03..a35ad872d6438ebdb31739202580ac54ecd4929c 100755 (executable)
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -413,7 +413,7 @@ SPL_METHOD(RecursiveIteratorIterator, getSubIterator)
 }
 
 /* {{{ spl_RecursiveIteratorIterator_dtor */
-static void spl_RecursiveIteratorIterator_dtor(void *_object, zend_object_handle handle TSRMLS_DC)
+static void spl_RecursiveIteratorIterator_free_storage(void *_object TSRMLS_DC)
 {
        spl_recursive_it_object   *object = (spl_recursive_it_object *)_object;
        zend_object_iterator      *sub_iter;
@@ -449,7 +449,7 @@ static zend_object_value spl_RecursiveIteratorIterator_new(zend_class_entry *cla
        zend_hash_init(intern->std.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
        zend_hash_copy(intern->std.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
 
-       retval.handle = zend_objects_store_put(intern, spl_RecursiveIteratorIterator_dtor, NULL TSRMLS_CC);
+       retval.handle = zend_objects_store_put(intern, NULL, (zend_objects_free_object_storage_t) spl_RecursiveIteratorIterator_free_storage, NULL TSRMLS_CC);
        retval.handlers = &spl_handlers_rec_it_it;
        return retval;
 }
@@ -791,8 +791,8 @@ SPL_METHOD(ParentIterator, getChildren)
        zval_ptr_dtor(&retval);
 }
 
-/* {{{ spl_dual_it_dtor */
-static INLINE void spl_dual_it_dtor(void *_object, zend_object_handle handle TSRMLS_DC)
+/* {{{ spl_dual_it_free_storage */
+static INLINE void spl_dual_it_free_storage(void *_object TSRMLS_DC)
 {
        spl_dual_it_object        *object = (spl_dual_it_object *)_object;
 
@@ -828,7 +828,7 @@ static zend_object_value spl_dual_it_new(zend_class_entry *class_type TSRMLS_DC)
        zend_hash_init(intern->std.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
        zend_hash_copy(intern->std.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
 
-       retval.handle = zend_objects_store_put(intern, spl_dual_it_dtor, NULL TSRMLS_CC);
+       retval.handle = zend_objects_store_put(intern, NULL, (zend_objects_free_object_storage_t) spl_dual_it_free_storage, NULL TSRMLS_CC);
        retval.handlers = &spl_handlers_dual_it;
        return retval;
 }