diff options
| author | Marcus Boerger <helly@php.net> | 2005-11-20 13:05:15 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2005-11-20 13:05:15 +0000 |
| commit | cfeb12ccf551d3adf9331a852c8af0009a371f01 (patch) | |
| tree | 9c72bde719ad2eb2da611de17592259595bbdb5a /ext/simplexml | |
| parent | d20fe303b3ca56415edd1f866eaba7a1253463de (diff) | |
| download | php-git-cfeb12ccf551d3adf9331a852c8af0009a371f01.tar.gz | |
- MFH Fix parameter parsing
Diffstat (limited to 'ext/simplexml')
| -rw-r--r-- | ext/simplexml/simplexml.c | 8 | ||||
| -rwxr-xr-x | ext/simplexml/tests/sxe.dtd | 25 |
2 files changed, 24 insertions, 9 deletions
diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index a1d374a44a..985343bbce 100644 --- a/ext/simplexml/simplexml.c +++ b/ext/simplexml/simplexml.c @@ -1283,7 +1283,8 @@ PHP_FUNCTION(simplexml_load_file) 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 @@ PHP_FUNCTION(simplexml_load_string) 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 @@ PHP_FUNCTION(simplexml_load_string) /* }}} */ -/* {{{ proto SimpleXMLElement::__construct() +/* {{{ proto SimpleXMLElement::__construct(string data) SimpleXMLElement constructor */ SXE_METHOD(__construct) { diff --git a/ext/simplexml/tests/sxe.dtd b/ext/simplexml/tests/sxe.dtd index 8a8dde4308..b75a7922b0 100755 --- a/ext/simplexml/tests/sxe.dtd +++ b/ext/simplexml/tests/sxe.dtd @@ -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>
+
|