rrichards Sat Aug 5 12:33:34 2006 UTC
Modified files:
/php-src/ext/dom document.c
Log:
unicode changes
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/document.c?r1=1.77&r2=1.78&diff_format=u
Index: php-src/ext/dom/document.c
diff -u php-src/ext/dom/document.c:1.77 php-src/ext/dom/document.c:1.78
--- php-src/ext/dom/document.c:1.77 Fri Aug 4 18:11:27 2006
+++ php-src/ext/dom/document.c Sat Aug 5 12:33:34 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: document.c,v 1.77 2006/08/04 18:11:27 rrichards Exp $ */
+/* $Id: document.c,v 1.78 2006/08/05 12:33:34 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1544,7 +1544,7 @@
return;
}
} else {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l",
&source, &source_len, &options) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|l",
&source, &source_len, &options) == FAILURE) {
return;
}
}
@@ -1871,11 +1871,11 @@
zend_uchar source_type = IS_STRING;
if (type == DOM_LOAD_FILE) {
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
getThis(), "Os", &id, dom_document_class_entry, &source, &source_len,
&source_type) == FAILURE) {
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
getThis(), "Ot", &id, dom_document_class_entry, &source, &source_len,
&source_type) == FAILURE) {
return;
}
} else {
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
getThis(), "Os", &id, dom_document_class_entry, &source, &source_len) ==
FAILURE) {
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
getThis(), "OS", &id, dom_document_class_entry, &source, &source_len) ==
FAILURE) {
return;
}
}
@@ -1981,11 +1981,11 @@
zend_uchar source_type = IS_STRING;
if (type == DOM_LOAD_FILE) {
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
getThis(), "Os", &id, dom_document_class_entry, &source, &source_len,
&source_type) == FAILURE) {
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
getThis(), "Ot", &id, dom_document_class_entry, &source, &source_len,
&source_type) == FAILURE) {
return;
}
} else {
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
getThis(), "Os", &id, dom_document_class_entry, &source, &source_len) ==
FAILURE) {
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
getThis(), "OS", &id, dom_document_class_entry, &source, &source_len) ==
FAILURE) {
return;
}
}
@@ -2090,11 +2090,11 @@
id = getThis();
if (mode == DOM_LOAD_FILE) {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
&source, &source_len, &source_type) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "t",
&source, &source_len, &source_type) == FAILURE) {
return;
}
} else {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
&source, &source_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S",
&source, &source_len) == FAILURE) {
return;
}
}
@@ -2194,9 +2194,9 @@
dom_object *intern;
dom_doc_propsptr doc_props;
char *file;
- zend_uchar file_type = IS_STRING;
+ zend_uchar file_type;
- if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
"Os", &id, dom_document_class_entry, &file, &file_len) == FAILURE) {
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
"Ot", &id, dom_document_class_entry, &file, &file_len, &file_type) == FAILURE) {
return;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
