From cfeb12ccf551d3adf9331a852c8af0009a371f01 Mon Sep 17 00:00:00 2001 From: Marcus Boerger Date: Sun, 20 Nov 2005 13:05:15 +0000 Subject: [PATCH] - MFH Fix parameter parsing --- ext/simplexml/simplexml.c | 8 +++++--- 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 @@ - + - + - - + + - + - + + + + + + + + + + + + + -- 2.50.1