zeev Wed Feb 4 06:14:48 2004 EDT
Modified files:
/php-src/ext/com_dotnet com_handlers.c com_misc.c com_saproxy.c
php_com_dotnet_internal.h
/php-src/ext/dom php_dom.c
/php-src/ext/mono php_mono.c
/php-src/ext/mysqli mysqli.c
/php-src/ext/sqlite sqlite.c
/php-src/ext/tidy php_tidy.h tidy.c
/php-src/ext/xsl php_xsl.c php_xsl.h
Log:
- Update with new destructor code
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_handlers.c?r1=1.13&r2=1.14&ty=u
Index: php-src/ext/com_dotnet/com_handlers.c
diff -u php-src/ext/com_dotnet/com_handlers.c:1.13
php-src/ext/com_dotnet/com_handlers.c:1.14
--- php-src/ext/com_dotnet/com_handlers.c:1.13 Tue Jan 13 11:05:38 2004
+++ php-src/ext/com_dotnet/com_handlers.c Wed Feb 4 06:14:30 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_handlers.c,v 1.13 2004/01/13 16:05:38 wez Exp $ */
+/* $Id: com_handlers.c,v 1.14 2004/02/04 11:14:30 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -554,7 +554,7 @@
}
}
-void php_com_object_dtor(void *object, zend_object_handle handle TSRMLS_DC)
+void php_com_object_free_storage(void *object TSRMLS_DC)
{
php_com_dotnet_object *obj = (php_com_dotnet_object*)object;
@@ -616,7 +616,8 @@
obj->code_page = CP_ACP;
obj->ce = ce;
- retval.handle = zend_objects_store_put(obj, php_com_object_dtor,
php_com_object_clone TSRMLS_CC);
+
+ retval.handle = zend_objects_store_put(obj, NULL, php_com_object_free_storage,
php_com_object_clone TSRMLS_CC);
retval.handlers = &php_com_object_handlers;
return retval;
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_misc.c?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/com_dotnet/com_misc.c
diff -u php-src/ext/com_dotnet/com_misc.c:1.3 php-src/ext/com_dotnet/com_misc.c:1.4
--- php-src/ext/com_dotnet/com_misc.c:1.3 Thu Jan 8 03:14:20 2004
+++ php-src/ext/com_dotnet/com_misc.c Wed Feb 4 06:14:30 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_misc.c,v 1.3 2004/01/08 08:14:20 andi Exp $ */
+/* $Id: com_misc.c,v 1.4 2004/02/04 11:14:30 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -60,7 +60,7 @@
IDispatch_GetTypeInfo(V_DISPATCH(&obj->v), 0, LANG_NEUTRAL, &obj->typeinfo);
Z_TYPE_P(z) = IS_OBJECT;
- z->value.obj.handle = zend_objects_store_put(obj, php_com_object_dtor,
php_com_object_clone TSRMLS_CC);
+ z->value.obj.handle = zend_objects_store_put(obj, NULL,
php_com_object_free_storage, php_com_object_clone TSRMLS_CC);
z->value.obj.handlers = &php_com_object_handlers;
}
@@ -83,7 +83,7 @@
Z_TYPE_P(z) = IS_OBJECT;
- z->value.obj.handle = zend_objects_store_put(obj, php_com_object_dtor,
php_com_object_clone TSRMLS_CC);
+ z->value.obj.handle = zend_objects_store_put(obj, NULL,
php_com_object_free_storage, php_com_object_clone TSRMLS_CC);
z->value.obj.handlers = &php_com_object_handlers;
}
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_saproxy.c?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/com_dotnet/com_saproxy.c
diff -u php-src/ext/com_dotnet/com_saproxy.c:1.2
php-src/ext/com_dotnet/com_saproxy.c:1.3
--- php-src/ext/com_dotnet/com_saproxy.c:1.2 Thu Jan 8 03:14:20 2004
+++ php-src/ext/com_dotnet/com_saproxy.c Wed Feb 4 06:14:30 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_saproxy.c,v 1.2 2004/01/08 08:14:20 andi Exp $ */
+/* $Id: com_saproxy.c,v 1.3 2004/02/04 11:14:30 zeev Exp $ */
/* This module implements a SafeArray proxy which is used internally
* by the engine when resolving multi-dimensional array accesses on
@@ -261,7 +261,7 @@
saproxy_object_cast
};
-static void saproxy_dtor(void *object, zend_object_handle handle TSRMLS_DC)
+static void saproxy_free_storage(void *object TSRMLS_DC)
{
php_com_saproxy *proxy = (php_com_saproxy *)object;
@@ -313,7 +313,7 @@
proxy->indices[proxy->dimensions-1] = index;
Z_TYPE_P(proxy_out) = IS_OBJECT;
- Z_OBJ_HANDLE_P(proxy_out) = zend_objects_store_put(proxy, saproxy_dtor,
saproxy_clone TSRMLS_CC);
+ Z_OBJ_HANDLE_P(proxy_out) = zend_objects_store_put(proxy, NULL,
saproxy_free_storage, saproxy_clone TSRMLS_CC);
Z_OBJ_HT_P(proxy_out) = &php_com_saproxy_handlers;
return 1;
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/php_com_dotnet_internal.h?r1=1.8&r2=1.9&ty=u
Index: php-src/ext/com_dotnet/php_com_dotnet_internal.h
diff -u php-src/ext/com_dotnet/php_com_dotnet_internal.h:1.8
php-src/ext/com_dotnet/php_com_dotnet_internal.h:1.9
--- php-src/ext/com_dotnet/php_com_dotnet_internal.h:1.8 Tue Jan 13 08:38:11
2004
+++ php-src/ext/com_dotnet/php_com_dotnet_internal.h Wed Feb 4 06:14:30 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_com_dotnet_internal.h,v 1.8 2004/01/13 13:38:11 wez Exp $ */
+/* $Id: php_com_dotnet_internal.h,v 1.9 2004/02/04 11:14:30 zeev Exp $ */
#ifndef PHP_COM_DOTNET_INTERNAL_H
#define PHP_COM_DOTNET_INTERNAL_H
@@ -77,7 +77,7 @@
/* com_handlers.c */
zend_object_value php_com_object_new(zend_class_entry *ce TSRMLS_DC);
void php_com_object_clone(void *object, void **clone_ptr TSRMLS_DC);
-void php_com_object_dtor(void *object, zend_object_handle handle TSRMLS_DC);
+void php_com_object_free_storage(void *object TSRMLS_DC);
zend_object_handlers php_com_object_handlers;
void php_com_object_enable_event_sink(php_com_dotnet_object *obj, int enable
TSRMLS_DC);
http://cvs.php.net/diff.php/php-src/ext/dom/php_dom.c?r1=1.49&r2=1.50&ty=u
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.49 php-src/ext/dom/php_dom.c:1.50
--- php-src/ext/dom/php_dom.c:1.49 Thu Jan 22 16:16:05 2004
+++ php-src/ext/dom/php_dom.c Wed Feb 4 06:14:31 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_dom.c,v 1.49 2004/01/22 21:16:05 rrichards Exp $ */
+/* $Id: php_dom.c,v 1.50 2004/02/04 11:14:31 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -728,8 +728,8 @@
/* }}} */
#if defined(LIBXML_XPATH_ENABLED)
-/* {{{ dom_xpath_objects_dtor */
-void dom_xpath_objects_dtor(void *object, zend_object_handle handle TSRMLS_DC)
+/* {{{ dom_xpath_objects_free_storage */
+void dom_xpath_objects_free_storage(void *object TSRMLS_DC)
{
dom_object *intern = (dom_object *)object;
@@ -747,8 +747,8 @@
/* }}} */
#endif
-/* {{{ dom_objects_dtor */
-void dom_objects_dtor(void *object, zend_object_handle handle TSRMLS_DC)
+/* {{{ dom_objects_free_storage */
+void dom_objects_free_storage(void *object TSRMLS_DC)
{
dom_object *intern = (dom_object *)object;
int retcount;
@@ -830,7 +830,7 @@
intern = dom_objects_set_class(class_type TSRMLS_CC);
- retval.handle = zend_objects_store_put(intern, dom_objects_dtor,
dom_objects_clone TSRMLS_CC);
+ retval.handle = zend_objects_store_put(intern, NULL, dom_objects_free_storage,
dom_objects_clone TSRMLS_CC);
intern->handle = retval.handle;
retval.handlers = &dom_object_handlers;
@@ -847,7 +847,7 @@
intern = dom_objects_set_class(class_type TSRMLS_CC);
- retval.handle = zend_objects_store_put(intern, dom_xpath_objects_dtor,
dom_objects_clone TSRMLS_CC);
+ retval.handle = zend_objects_store_put(intern, NULL,
dom_xpath_objects_free_storage, dom_objects_clone TSRMLS_CC);
intern->handle = retval.handle;
retval.handlers = &dom_object_handlers;
@@ -856,7 +856,7 @@
/* }}} */
#endif
-void dom_nnodemap_objects_dtor(void *object, zend_object_handle handle TSRMLS_DC)
+void dom_nnodemap_objects_free_storage(void *object TSRMLS_DC)
{
dom_nnodemap_object *objmap;
zval *baseobj;
@@ -900,7 +900,7 @@
objmap->local = NULL;
objmap->ns = NULL;
- retval.handle = zend_objects_store_put(intern, dom_nnodemap_objects_dtor,
dom_objects_clone TSRMLS_CC);
+ retval.handle = zend_objects_store_put(intern, NULL,
dom_nnodemap_objects_free_storage, dom_objects_clone TSRMLS_CC);
intern->handle = retval.handle;
retval.handlers = &dom_object_handlers;
http://cvs.php.net/diff.php/php-src/ext/mono/php_mono.c?r1=1.12&r2=1.13&ty=u
Index: php-src/ext/mono/php_mono.c
diff -u php-src/ext/mono/php_mono.c:1.12 php-src/ext/mono/php_mono.c:1.13
--- php-src/ext/mono/php_mono.c:1.12 Thu Jan 8 03:16:10 2004
+++ php-src/ext/mono/php_mono.c Wed Feb 4 06:14:32 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mono.c,v 1.12 2004/01/08 08:16:10 andi Exp $ */
+/* $Id: php_mono.c,v 1.13 2004/02/04 11:14:32 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -796,7 +796,7 @@
ALLOC_HASHTABLE(intern->zo.properties);
zend_hash_init(intern->zo.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
- return_value.handle = zend_objects_store_put(intern, object_dtor,
object_clone);
+ return_value.handle = zend_objects_store_put(intern, object_dtor,
zend_objects_free_object_storage, object_clone);
return_value.handlers = (zend_object_handlers *) &mono_object_handlers;
return return_value;
@@ -895,7 +895,7 @@
method_obj->method = method;
(*return_value)->type = IS_OBJECT;
- (*return_value)->value.obj.handle = zend_objects_store_put(method_obj, NULL,
NULL);
+ (*return_value)->value.obj.handle = zend_objects_store_put(method_obj, NULL,
NULL, NULL);
(*return_value)->value.obj.handlers = (zend_object_handlers *)
zend_get_std_object_handlers();
}
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli.c?r1=1.26&r2=1.27&ty=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.26 php-src/ext/mysqli/mysqli.c:1.27
--- php-src/ext/mysqli/mysqli.c:1.26 Wed Jan 28 17:51:54 2004
+++ php-src/ext/mysqli/mysqli.c Wed Feb 4 06:14:33 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.26 2004/01/28 22:51:54 georg Exp $
+ $Id: mysqli.c,v 1.27 2004/02/04 11:14:33 zeev Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -101,9 +101,9 @@
}
/* }}} */
-/* {{{ mysqli_objects_dtor
+/* {{{ mysqli_objects_free_storage
*/
-static void mysqli_objects_dtor(void *object, zend_object_handle handle TSRMLS_DC)
+static void mysqli_objects_free_storage(void *object TSRMLS_DC)
{
mysqli_object *intern = (mysqli_object *)object;
MYSQLI_RESOURCE *my_res = (MYSQLI_RESOURCE *)intern->ptr;
@@ -276,7 +276,7 @@
zend_hash_copy(intern->zo.properties, &class_type->default_properties,
(copy_ctor_func_t) zval_add_ref,
(void *) &tmp, sizeof(zval *));
- retval.handle = zend_objects_store_put(intern, mysqli_objects_dtor,
mysqli_objects_clone TSRMLS_CC);
+ retval.handle = zend_objects_store_put(intern, NULL,
mysqli_objects_free_storage, mysqli_objects_clone TSRMLS_CC);
retval.handlers = &mysqli_object_handlers;
return retval;
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.115&r2=1.116&ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.115 php-src/ext/sqlite/sqlite.c:1.116
--- php-src/ext/sqlite/sqlite.c:1.115 Sat Jan 17 13:04:06 2004
+++ php-src/ext/sqlite/sqlite.c Wed Feb 4 06:14:35 2004
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.115 2004/01/17 18:04:06 helly Exp $
+ $Id: sqlite.c,v 1.116 2004/02/04 11:14:35 zeev Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -757,7 +757,7 @@
return le->ptr == ptr ? ZEND_HASH_APPLY_REMOVE : ZEND_HASH_APPLY_KEEP;
}
-static void sqlite_object_dtor(void *object, zend_object_handle handle TSRMLS_DC)
+static void sqlite_object_free_storage(void *object TSRMLS_DC)
{
sqlite_object *intern = (sqlite_object *)object;
@@ -791,7 +791,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, sqlite_object_dtor, NULL
TSRMLS_CC);
+ retval->handle = zend_objects_store_put(intern, NULL,
sqlite_object_free_storage, NULL TSRMLS_CC);
retval->handlers = handlers;
}
@@ -1054,7 +1054,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "SQLite support", "enabled");
- php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION "
$Id: sqlite.c,v 1.115 2004/01/17 18:04:06 helly Exp $");
+ php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION "
$Id: sqlite.c,v 1.116 2004/02/04 11:14:35 zeev Exp $");
php_info_print_table_row(2, "SQLite Library", sqlite_libversion());
php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding());
php_info_print_table_end();
http://cvs.php.net/diff.php/php-src/ext/tidy/php_tidy.h?r1=1.19&r2=1.20&ty=u
Index: php-src/ext/tidy/php_tidy.h
diff -u php-src/ext/tidy/php_tidy.h:1.19 php-src/ext/tidy/php_tidy.h:1.20
--- php-src/ext/tidy/php_tidy.h:1.19 Wed Jan 21 05:19:56 2004
+++ php-src/ext/tidy/php_tidy.h Wed Feb 4 06:14:46 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_tidy.h,v 1.19 2004/01/21 10:19:56 john Exp $ */
+/* $Id: php_tidy.h,v 1.20 2004/02/04 11:14:46 zeev Exp $ */
#ifndef PHP_TIDY_H
#define PHP_TIDY_H
@@ -200,7 +200,7 @@
};
static char *php_tidy_file_to_mem(char *, zend_bool TSRMLS_DC);
-static void tidy_object_dtor(void *, zend_object_handle TSRMLS_DC);
+static void tidy_object_free_storage(void * TSRMLS_DC);
static zend_object_value tidy_object_new_node(zend_class_entry * TSRMLS_DC);
static zend_object_value tidy_object_new_doc(zend_class_entry * TSRMLS_DC);
static zend_object_value tidy_object_new_exception(zend_class_entry * TSRMLS_DC);
http://cvs.php.net/diff.php/php-src/ext/tidy/tidy.c?r1=1.36&r2=1.37&ty=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.36 php-src/ext/tidy/tidy.c:1.37
--- php-src/ext/tidy/tidy.c:1.36 Wed Jan 21 05:19:56 2004
+++ php-src/ext/tidy/tidy.c Wed Feb 4 06:14:46 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tidy.c,v 1.36 2004/01/21 10:19:56 john Exp $ */
+/* $Id: tidy.c,v 1.37 2004/02/04 11:14:46 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -317,7 +317,7 @@
return data;
}
-static void tidy_object_dtor(void *object, zend_object_handle handle TSRMLS_DC)
+static void tidy_object_free_storage(void *object TSRMLS_DC)
{
PHPTidyObj *intern = (PHPTidyObj *)object;
@@ -382,7 +382,7 @@
break;
}
- retval->handle = zend_objects_store_put(intern, tidy_object_dtor, NULL
TSRMLS_CC);
+ retval->handle = zend_objects_store_put(intern, NULL,
tidy_object_free_storage, NULL TSRMLS_CC);
retval->handlers = handlers;
}
@@ -768,7 +768,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Tidy support", "enabled");
php_info_print_table_row(2, "libTidy Release", (char *)tidyReleaseDate());
- php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION "
($Id: tidy.c,v 1.36 2004/01/21 10:19:56 john Exp $)");
+ php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION "
($Id: tidy.c,v 1.37 2004/02/04 11:14:46 zeev Exp $)");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
http://cvs.php.net/diff.php/php-src/ext/xsl/php_xsl.c?r1=1.18&r2=1.19&ty=u
Index: php-src/ext/xsl/php_xsl.c
diff -u php-src/ext/xsl/php_xsl.c:1.18 php-src/ext/xsl/php_xsl.c:1.19
--- php-src/ext/xsl/php_xsl.c:1.18 Mon Jan 19 10:07:08 2004
+++ php-src/ext/xsl/php_xsl.c Wed Feb 4 06:14:47 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xsl.c,v 1.18 2004/01/19 15:07:08 chregu Exp $ */
+/* $Id: php_xsl.c,v 1.19 2004/02/04 11:14:47 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -74,8 +74,8 @@
}
/* }}} */
-/* {{{ 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_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;
http://cvs.php.net/diff.php/php-src/ext/xsl/php_xsl.h?r1=1.9&r2=1.10&ty=u
Index: php-src/ext/xsl/php_xsl.h
diff -u php-src/ext/xsl/php_xsl.h:1.9 php-src/ext/xsl/php_xsl.h:1.10
--- php-src/ext/xsl/php_xsl.h:1.9 Mon Jan 19 10:07:08 2004
+++ php-src/ext/xsl/php_xsl.h Wed Feb 4 06:14:47 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xsl.h,v 1.9 2004/01/19 15:07:08 chregu Exp $ */
+/* $Id: php_xsl.h,v 1.10 2004/02/04 11:14:47 zeev Exp $ */
#ifndef PHP_XSL_H
#define PHP_XSL_H
@@ -60,7 +60,7 @@
} 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) \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
