stas Sun Mar 21 13:29:54 2004 EDT
Modified files:
/php-src/ext/dom php_dom.c
/php-src/ext/mysqli mysqli.c
/php-src/ext/simplexml simplexml.c
Log:
Update for new read_property API
http://cvs.php.net/diff.php/php-src/ext/dom/php_dom.c?r1=1.55&r2=1.56&ty=u
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.55 php-src/ext/dom/php_dom.c:1.56
--- php-src/ext/dom/php_dom.c:1.55 Mon Mar 1 07:09:21 2004
+++ php-src/ext/dom/php_dom.c Sun Mar 21 13:26:07 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_dom.c,v 1.55 2004/03/01 12:09:21 rrichards Exp $ */
+/* $Id: php_dom.c,v 1.56 2004/03/21 18:26:07 stas Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -200,7 +200,7 @@
/* }}} */
/* {{{ dom_read_property */
-zval *dom_read_property(zval *object, zval *member, zend_bool silent TSRMLS_DC)
+zval *dom_read_property(zval *object, zval *member, int type TSRMLS_DC)
{
dom_object *obj;
zval tmp_member;
@@ -232,7 +232,7 @@
}
} else {
std_hnd = zend_get_std_object_handlers();
- retval = std_hnd->read_property(object, member, silent TSRMLS_CC);
+ retval = std_hnd->read_property(object, member, type TSRMLS_CC);
}
if (member == &tmp_member) {
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli.c?r1=1.36&r2=1.37&ty=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.36 php-src/ext/mysqli/mysqli.c:1.37
--- php-src/ext/mysqli/mysqli.c:1.36 Thu Mar 18 08:03:17 2004
+++ php-src/ext/mysqli/mysqli.c Sun Mar 21 13:27:23 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.36 2004/03/18 13:03:17 georg Exp $
+ $Id: mysqli.c,v 1.37 2004/03/21 18:27:23 stas Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -160,7 +160,7 @@
/* }}} */
/* {{{ mysqli_read_property */
-zval *mysqli_read_property(zval *object, zval *member, zend_bool silent TSRMLS_DC)
+zval *mysqli_read_property(zval *object, zval *member, int type TSRMLS_DC)
{
zval tmp_member;
zval *retval;
@@ -197,7 +197,7 @@
}
} else {
std_hnd = zend_get_std_object_handlers();
- retval = std_hnd->read_property(object, member, silent TSRMLS_CC);
+ retval = std_hnd->read_property(object, member, type TSRMLS_CC);
}
if (member == &tmp_member) {
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.134&r2=1.135&ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.134 php-src/ext/simplexml/simplexml.c:1.135
--- php-src/ext/simplexml/simplexml.c:1.134 Tue Mar 16 16:39:43 2004
+++ php-src/ext/simplexml/simplexml.c Sun Mar 21 13:28:38 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: simplexml.c,v 1.134 2004/03/16 21:39:43 derick Exp $ */
+/* $Id: simplexml.c,v 1.135 2004/03/21 18:28:38 stas Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -255,9 +255,9 @@
/* {{{ sxe_property_read()
*/
-static zval * sxe_property_read(zval *object, zval *member, zend_bool silent
TSRMLS_DC)
+static zval * sxe_property_read(zval *object, zval *member, int type TSRMLS_DC)
{
- return sxe_prop_dim_read(object, member, 1, 0, silent TSRMLS_CC);
+ return sxe_prop_dim_read(object, member, 1, 0, type == BP_VAR_IS TSRMLS_CC);
}
/* }}} */
@@ -1634,7 +1634,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.134 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.135 $");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
