helly Sun Nov 20 08:05:15 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/simplexml simplexml.c
/php-src/ext/simplexml/tests sxe.dtd
Log:
- MFH Fix parameter parsing
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.151.2.6&r2=1.151.2.7&ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.6
php-src/ext/simplexml/simplexml.c:1.151.2.7
--- php-src/ext/simplexml/simplexml.c:1.151.2.6 Sat Nov 5 17:37:18 2005
+++ php-src/ext/simplexml/simplexml.c Sun Nov 20 08:05:13 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: simplexml.c,v 1.151.2.6 2005/11/05 22:37:18 rasmus Exp $ */
+/* $Id: simplexml.c,v 1.151.2.7 2005/11/20 13:05:13 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1283,7 +1283,8 @@
int filename_len;
xmlDocPtr docp;
char *classname = "";
- int classname_len = 0, options=0;
+ int classname_len = 0;
+ long options = 0;
zend_class_entry *ce= sxe_class_entry;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|sl", &filename,
&filename_len, &classname, &classname_len, &options) == FAILURE) {
@@ -1326,7 +1327,8 @@
int data_len;
xmlDocPtr docp;
char *classname = "";
- int classname_len = 0, options=0;
+ int classname_len = 0;
+ long options = 0;
zend_class_entry *ce= sxe_class_entry;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|sl", &data,
&data_len, &classname, &classname_len, &options) == FAILURE) {
@@ -1361,7 +1363,7 @@
/* }}} */
-/* {{{ proto SimpleXMLElement::__construct()
+/* {{{ proto SimpleXMLElement::__construct(string data)
SimpleXMLElement constructor */
SXE_METHOD(__construct)
{
@@ -1741,7 +1743,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.151.2.6 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.151.2.7 $");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/sxe.dtd?r1=1.2&r2=1.2.4.1&ty=u
Index: php-src/ext/simplexml/tests/sxe.dtd
diff -u php-src/ext/simplexml/tests/sxe.dtd:1.2
php-src/ext/simplexml/tests/sxe.dtd:1.2.4.1
--- php-src/ext/simplexml/tests/sxe.dtd:1.2 Sun Oct 26 08:18:59 2003
+++ php-src/ext/simplexml/tests/sxe.dtd Sun Nov 20 08:05:15 2005
@@ -1,21 +1,34 @@
<?xml encoding='US-ASCII'?>
-<!ELEMENT sxe elem1, elem 11>
+<!ELEMENT sxe (elem1+, elem11, elem22*)>
<!ATTLIST sxe id CDATA #implied>
-<!ELEMENT elem1 elem2>
+<!ELEMENT elem1 elem2*>
<!ATTLIST elem1 attr1 CDATA #required
attr2 CDATA "default>
-<!ELEMENT elem2 elem3>
-<!ATTLIST elem2>
+<!ELEMENT elem2 elem3*>
+<!ATTLIST elem2 att25 CDATA #implied
+ att42 CDATA #implied>
-<!ELEMENT elem3 elem4>
+<!ELEMENT elem3 elem4*>
<!ATTLIST elem3>
<!ELEMENT elem4 EMPTY>
<!ATTLIST elem4>
-<!ELEMENT elem11 EMPTY>
+<!ELEMENT elem11 elem111*>
<!ATTLIST elem11>
+<!ELEMNET elem111 elem1111*>
+<!ATTLIST elem111>
+
+<!ELEMENT elem1111 EMPTY>
+<!ATTLIST elem1111>
+
+<!ELEMENT elem22 elem222*>
+<!ATTLIST elem22 attr22 CDATA #implied>
+
+<!ELEMENT elem222 EMPTY>
+<!ATTLIST elem222>
+
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
