diff options
| author | Rob Richards <rrichards@php.net> | 2005-12-09 20:52:15 +0000 |
|---|---|---|
| committer | Rob Richards <rrichards@php.net> | 2005-12-09 20:52:15 +0000 |
| commit | cc969671322a6da419a4dae8370fd2442c2fb21c (patch) | |
| tree | f74fab53ca0d488a5eda559d1d53a5f70f65fc23 /ext/xmlwriter | |
| parent | ca423244978a9ead686f7c67a225e86c5fbbb0ee (diff) | |
| download | php-git-cc969671322a6da419a4dae8370fd2442c2fb21c.tar.gz | |
MFH: allow NULL prefix to create default namespace
fix tests
Diffstat (limited to 'ext/xmlwriter')
| -rw-r--r-- | ext/xmlwriter/php_xmlwriter.c | 10 | ||||
| -rw-r--r-- | ext/xmlwriter/tests/009.phpt | 2 | ||||
| -rw-r--r-- | ext/xmlwriter/tests/OO_009.phpt | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ext/xmlwriter/php_xmlwriter.c b/ext/xmlwriter/php_xmlwriter.c index d773be3b4e..ca6d54984f 100644 --- a/ext/xmlwriter/php_xmlwriter.c +++ b/ext/xmlwriter/php_xmlwriter.c @@ -658,7 +658,7 @@ PHP_FUNCTION(xmlwriter_write_attribute_ns) if (this) { if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ssss", - &name, &name_len, &content, &content_len) == FAILURE) { + &prefix, &prefix_len, &name, &name_len, &uri, &uri_len, &content, &content_len) == FAILURE) { return; } XMLWRITER_FROM_OBJECT(intern, this); @@ -743,7 +743,7 @@ PHP_FUNCTION(xmlwriter_start_element_ns) zval *this = getThis(); if (this) { - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss", + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!ss", &prefix, &prefix_len, &name, &name_len, &uri, &uri_len) == FAILURE) { return; } @@ -751,7 +751,7 @@ PHP_FUNCTION(xmlwriter_start_element_ns) } else #endif { - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsss", &pind, + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs!ss", &pind, &prefix, &prefix_len, &name, &name_len, &uri, &uri_len) == FAILURE) { return; } @@ -839,7 +839,7 @@ PHP_FUNCTION(xmlwriter_write_element_ns) zval *this = getThis(); if (this) { - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ssss", + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!sss", &prefix, &prefix_len, &name, &name_len, &uri, &uri_len, &content, &content_len) == FAILURE) { return; } @@ -847,7 +847,7 @@ PHP_FUNCTION(xmlwriter_write_element_ns) } else #endif { - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rssss", &pind, + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs!sss", &pind, &prefix, &prefix_len, &name, &name_len, &uri, &uri_len, &content, &content_len) == FAILURE) { return; } diff --git a/ext/xmlwriter/tests/009.phpt b/ext/xmlwriter/tests/009.phpt index 2322b7c0ba..9c00fe7b0e 100644 --- a/ext/xmlwriter/tests/009.phpt +++ b/ext/xmlwriter/tests/009.phpt @@ -22,11 +22,11 @@ xmlwriter_write_pi($xw, 'php', 'echo "hello world"; '); xmlwriter_end_element($xw); xmlwriter_start_element($xw, 'cdata'); xmlwriter_start_cdata($xw); -xmlwriter_end_element($xw); xmlwriter_text($xw, '<>&"'); xmlwriter_end_cdata($xw); xmlwriter_end_element($xw); xmlwriter_end_element($xw); +xmlwriter_end_element($xw); xmlwriter_end_document($xw); // Force to write and empty the buffer $output = xmlwriter_flush($xw, true); diff --git a/ext/xmlwriter/tests/OO_009.phpt b/ext/xmlwriter/tests/OO_009.phpt index 659cfc8d6d..bd5a33c6bd 100644 --- a/ext/xmlwriter/tests/OO_009.phpt +++ b/ext/xmlwriter/tests/OO_009.phpt @@ -23,11 +23,11 @@ $xw->writePi('php', 'echo "hello world"; '); $xw->endElement(); $xw->startElement('cdata'); $xw->startCdata(); -$xw->endElement(); $xw->text('<>&"'); $xw->endCdata(); $xw->endElement(); $xw->endElement(); +$xw->endElement(); $xw->endDocument(); // Force to write and empty the buffer $output = $xw->flush(true); |