zeev Wed Feb 4 07:45:48 2004 EDT
Modified files:
/php-src/ext/spl spl_array.c spl_directory.c spl_iterators.c
Log:
API updates
http://cvs.php.net/diff.php/php-src/ext/spl/spl_array.c?r1=1.30&r2=1.31&ty=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.30 php-src/ext/spl/spl_array.c:1.31
--- php-src/ext/spl/spl_array.c:1.30 Tue Jan 20 15:59:45 2004
+++ php-src/ext/spl/spl_array.c Wed Feb 4 07:45:47 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_array.c,v 1.30 2004/01/20 20:59:45 helly Exp $ */
+/* $Id: spl_array.c,v 1.31 2004/02/04 12:45:47 zeev Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -75,8 +75,8 @@
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 @@
}
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 {
http://cvs.php.net/diff.php/php-src/ext/spl/spl_directory.c?r1=1.21&r2=1.22&ty=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.21 php-src/ext/spl/spl_directory.c:1.22
--- php-src/ext/spl/spl_directory.c:1.21 Fri Jan 23 16:33:56 2004
+++ php-src/ext/spl/spl_directory.c Wed Feb 4 07:45:47 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_directory.c,v 1.21 2004/01/23 21:33:56 helly Exp $ */
+/* $Id: spl_directory.c,v 1.22 2004/02/04 12:45:47 zeev Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -50,9 +50,9 @@
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 @@
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;
}
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.18&r2=1.19&ty=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.18 php-src/ext/spl/spl_iterators.c:1.19
--- php-src/ext/spl/spl_iterators.c:1.18 Wed Jan 28 17:59:03 2004
+++ php-src/ext/spl/spl_iterators.c Wed Feb 4 07:45:47 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.18 2004/01/28 22:59:03 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.19 2004/02/04 12:45:47 zeev Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -413,7 +413,7 @@
}
/* {{{ 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 @@
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 @@
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 @@
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;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
