diff options
author | Zeev Suraski <zeev@php.net> | 2004-02-04 11:14:47 +0000 |
---|---|---|
committer | Zeev Suraski <zeev@php.net> | 2004-02-04 11:14:47 +0000 |
commit | 8424be849f7523f589ff673b860bad4126b4fa63 (patch) | |
tree | 96d94e556f809dfde29bcdafd59a4c1f1b06de9f /ext/xsl | |
parent | f5f7d569a0dc42d4469f4091ecf7d71a7152efc4 (diff) | |
download | php-git-8424be849f7523f589ff673b860bad4126b4fa63.tar.gz |
- Update with new destructor code
Diffstat (limited to 'ext/xsl')
-rw-r--r-- | ext/xsl/php_xsl.c | 6 | ||||
-rw-r--r-- | ext/xsl/php_xsl.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/xsl/php_xsl.c b/ext/xsl/php_xsl.c index 29255c991a..31c9192ea6 100644 --- a/ext/xsl/php_xsl.c +++ b/ext/xsl/php_xsl.c @@ -74,8 +74,8 @@ void xsl_objects_clone(void *object, void **object_clone TSRMLS_DC) } /* }}} */ -/* {{{ xsl_objects_dtor */ -void xsl_objects_dtor(void *object, zend_object_handle handle TSRMLS_DC) +/* {{{ xsl_objects_free_storage */ +void xsl_objects_free_storage(void *object TSRMLS_DC) { xsl_object *intern = (xsl_object *)object; @@ -119,7 +119,7 @@ zend_object_value xsl_objects_new(zend_class_entry *class_type TSRMLS_DC) zend_hash_copy(intern->std.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *)); ALLOC_HASHTABLE(intern->parameter); zend_hash_init(intern->parameter, 0, NULL, ZVAL_PTR_DTOR, 0); - retval.handle = zend_objects_store_put(intern, xsl_objects_dtor, xsl_objects_clone TSRMLS_CC); + retval.handle = zend_objects_store_put(intern, NULL, xsl_objects_free_storage, xsl_objects_clone TSRMLS_CC); intern->handle = retval.handle; retval.handlers = &xsl_object_handlers; return retval; diff --git a/ext/xsl/php_xsl.h b/ext/xsl/php_xsl.h index f0933063c9..bd71315932 100644 --- a/ext/xsl/php_xsl.h +++ b/ext/xsl/php_xsl.h @@ -60,7 +60,7 @@ typedef struct _xsl_object { } xsl_object; void php_xsl_set_object(zval *wrapper, void *obj TSRMLS_DC); -void xsl_objects_dtor(void *object, zend_object_handle handle TSRMLS_DC); +void xsl_objects_free_storage(void *object TSRMLS_DC); zval *php_xsl_create_object(xsltStylesheetPtr obj, int *found, zval *wrapper_in, zval *return_value TSRMLS_DC); #define REGISTER_XSL_CLASS(ce, name, parent_ce, funcs, entry) \ |