com php-src: fixed ext/dom for int64 branch: ext/dom/attr.c ext/dom/cdatasection.c ext/dom/characterdata.c ext/dom/comment.c ext/dom/document.c
ext/dom/documentfragment.c ext/dom/domimplementation.c ext/dom/element.c ext/dom/entityreference.c ext/dom/namednodemap.c ext/dom/node.c
ext/dom/nodelist.c ext/dom/php_dom.c ext/d om/processinginstruction.c ext/dom/text.c ext/dom/xpath .c
| From: | Anatol Belski | Date: | Tue, 26 Nov 2013 21:25:22 +0000 |
| Subject: | com php-src: fixed ext/dom for int64 branch: ext/dom/attr.c ext/dom/cdatasection.c ext/dom/characterdata.c ext/dom/comment.c ext/dom/document.c ext/dom/documentfragment.c ext/dom/domimplementation.c ext/dom/element.c ext/dom/entityreference.c ext/dom/namednodemap.c ext/dom/node.c ext/dom/nodelist.c ext/dom/php_dom.c ext/d om/processinginstruction.c ext/dom/text.c ext/dom/xpath .c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74073@lists.php.net to get a copy of this message | ||
Commit: 74f9e6309c5a6cda72fdf9279dcccb7b45ef21bf
Author: Anatol Belski <ab@php.net> Tue, 26 Nov 2013 22:25:22 +0100
Parents: 1d2150ca4f20d679f1a0a0701b007a5ef3173caa
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=74f9e6309c5a6cda72fdf9279dcccb7b45ef21bf
Log:
fixed ext/dom for int64 branch
Changed paths:
M ext/dom/attr.c
M ext/dom/cdatasection.c
M ext/dom/characterdata.c
M ext/dom/comment.c
M ext/dom/document.c
M ext/dom/documentfragment.c
M ext/dom/domimplementation.c
M ext/dom/element.c
M ext/dom/entityreference.c
M ext/dom/namednodemap.c
M ext/dom/node.c
M ext/dom/nodelist.c
M ext/dom/php_dom.c
M ext/dom/processinginstruction.c
M ext/dom/text.c
M ext/dom/xpath.c
diff --git a/ext/dom/attr.c b/ext/dom/attr.c index d45ca88..128c711 100644 --- a/ext/dom/attr.c +++ b/ext/dom/attr.c @@ -61,11 +61,12 @@ PHP_METHOD(domattr, __construct) xmlNodePtr oldnode = NULL; dom_object *intern; char *name, *value = NULL; - int name_len, value_len, name_valid; + zend_str_size_int name_len, value_len; + int name_valid; zend_error_handling error_handling; zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os|s", &id, dom_attr_class_entry, &name, &name_len, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS|S", &id, dom_attr_class_entry, &name, &name_len, &value, &value_len) == FAILURE) { zend_restore_error_handling(&error_handling TSRMLS_CC); return; } @@ -192,7 +193,7 @@ int dom_attr_value_write(dom_object *obj, zval *newval TSRMLS_DC) convert_to_string(newval); } - xmlNodeSetContentLen((xmlNodePtr) attrp, Z_STRVAL_P(newval), Z_STRLEN_P(newval) + 1); + xmlNodeSetContentLen((xmlNodePtr) attrp, Z_STRVAL_P(newval), Z_STRSIZE_P(newval) + 1); if (newval == &value_copy) { zval_dtor(newval); diff --git a/ext/dom/cdatasection.c b/ext/dom/cdatasection.c index dc8a3f1..ffa0147 100644 --- a/ext/dom/cdatasection.c +++ b/ext/dom/cdatasection.c @@ -54,11 +54,11 @@ PHP_METHOD(domcdatasection, __construct) xmlNodePtr nodep = NULL, oldnode = NULL; dom_object *intern; char *value = NULL; - int value_len; + zend_str_size_int value_len; zend_error_handling error_handling; zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_cdatasection_class_entry, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_cdatasection_class_entry, &value, &value_len) == FAILURE) { zend_restore_error_handling(&error_handling TSRMLS_CC); return; } diff --git a/ext/dom/characterdata.c b/ext/dom/characterdata.c index 3b1f9b1..c7eb0e2 100644 --- a/ext/dom/characterdata.c +++ b/ext/dom/characterdata.c @@ -121,7 +121,7 @@ int dom_characterdata_data_write(dom_object *obj, zval *newval TSRMLS_DC) convert_to_string(newval); } - xmlNodeSetContentLen(nodep, Z_STRVAL_P(newval), Z_STRLEN_P(newval) + 1); + xmlNodeSetContentLen(nodep, Z_STRVAL_P(newval), Z_STRSIZE_P(newval) + 1); if (newval == &value_copy) { zval_dtor(newval); @@ -176,11 +176,11 @@ PHP_FUNCTION(dom_characterdata_substring_data) xmlChar *cur; xmlChar *substring; xmlNodePtr node; - long offset, count; + php_int_t offset, count; int length; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oll", &id, dom_characterdata_class_entry, &offset, &count) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oii", &id, dom_characterdata_class_entry, &offset, &count) == FAILURE) { return; } @@ -225,9 +225,9 @@ PHP_FUNCTION(dom_characterdata_append_data) xmlNode *nodep; dom_object *intern; char *arg; - int arg_len; + zend_str_size_int arg_len; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_characterdata_class_entry, &arg, &arg_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_characterdata_class_entry, &arg, &arg_len) == FAILURE) { return; } @@ -259,11 +259,12 @@ PHP_FUNCTION(dom_characterdata_insert_data) xmlChar *cur, *first, *second; xmlNodePtr node; char *arg; - long offset; - int length, arg_len; + php_int_t offset; + int length; + zend_str_size_int arg_len; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ols", &id, dom_characterdata_class_entry, &offset, &arg, &arg_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OiS", &id, dom_characterdata_class_entry, &offset, &arg, &arg_len) == FAILURE) { return; } @@ -306,11 +307,11 @@ PHP_FUNCTION(dom_characterdata_delete_data) zval *id; xmlChar *cur, *substring, *second; xmlNodePtr node; - long offset, count; + php_int_t offset, count; int length; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oll", &id, dom_characterdata_class_entry, &offset, &count) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oii", &id, dom_characterdata_class_entry, &offset, &count) == FAILURE) { return; } @@ -362,11 +363,12 @@ PHP_FUNCTION(dom_characterdata_replace_data) xmlChar *cur, *substring, *second = NULL; xmlNodePtr node; char *arg; - long offset, count; - int length, arg_len; + php_int_t offset, count; + int length; + zend_str_size_int arg_len; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Olls", &id, dom_characterdata_class_entry, &offset, &count, &arg, &arg_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OiiS", &id, dom_characterdata_class_entry, &offset, &count, &arg, &arg_len) == FAILURE) { return; } diff --git a/ext/dom/comment.c b/ext/dom/comment.c index 017c2ba..fe265d8 100644 --- a/ext/dom/comment.c +++ b/ext/dom/comment.c @@ -54,11 +54,11 @@ PHP_METHOD(domcomment, __construct) xmlNodePtr nodep = NULL, oldnode = NULL; dom_object *intern; char *value = NULL; - int value_len; + zend_str_size_int value_len; zend_error_handling error_handling; zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|s", &id, dom_comment_class_entry, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|S", &id, dom_comment_class_entry, &value, &value_len) == FAILURE) { zend_restore_error_handling(&error_handling TSRMLS_CC); return; } diff --git a/ext/dom/document.c b/ext/dom/document.c index efe6d90..dad98f7 100644 --- a/ext/dom/document.c +++ b/ext/dom/document.c @@ -905,10 +905,11 @@ PHP_FUNCTION(dom_document_create_element) xmlNode *node; xmlDocPtr docp; dom_object *intern; - int ret, name_len, value_len; + int ret; + zend_str_size_int name_len, value_len; char *name, *value = NULL; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os|s", &id, dom_document_class_entry, &name, &name_len, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS|S", &id, dom_document_class_entry, &name, &name_len, &value, &value_len) == FAILURE) { return; } @@ -964,11 +965,12 @@ PHP_FUNCTION(dom_document_create_text_node) zval *id; xmlNode *node; xmlDocPtr docp; - int ret, value_len; + int ret; + zend_str_size_int value_len; dom_object *intern; char *value; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_document_class_entry, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_document_class_entry, &value, &value_len) == FAILURE) { return; } @@ -992,11 +994,12 @@ PHP_FUNCTION(dom_document_create_comment) zval *id; xmlNode *node; xmlDocPtr docp; - int ret, value_len; + int ret; + zend_str_size_int value_len; dom_object *intern; char *value; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_document_class_entry, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_document_class_entry, &value, &value_len) == FAILURE) { return; } @@ -1020,11 +1023,12 @@ PHP_FUNCTION(dom_document_create_cdatasection) zval *id; xmlNode *node; xmlDocPtr docp; - int ret, value_len; + int ret; + zend_str_size_int value_len; dom_object *intern; char *value; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_document_class_entry, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_document_class_entry, &value, &value_len) == FAILURE) { return; } @@ -1048,11 +1052,12 @@ PHP_FUNCTION(dom_document_create_processing_instruction) zval *id; xmlNode *node; xmlDocPtr docp; - int ret, value_len, name_len = 0; + int ret; + zend_str_size_int value_len, name_len = 0; dom_object *intern; char *name, *value = NULL; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os|s", &id, dom_document_class_entry, &name, &name_len, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS|S", &id, dom_document_class_entry, &name, &name_len, &value, &value_len) == FAILURE) { return; } @@ -1083,11 +1088,12 @@ PHP_FUNCTION(dom_document_create_attribute) zval *id; xmlAttrPtr node; xmlDocPtr docp; - int ret, name_len; + int ret; + zend_str_size_int name_len; dom_object *intern; char *name; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_document_class_entry, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_document_class_entry, &name, &name_len) == FAILURE) { return; } @@ -1118,10 +1124,11 @@ PHP_FUNCTION(dom_document_create_entity_reference) xmlNode *node; xmlDocPtr docp = NULL; dom_object *intern; - int ret, name_len; + int ret; + zend_str_size_int name_len; char *name; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_document_class_entry, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_document_class_entry, &name, &name_len) == FAILURE) { return; } @@ -1149,12 +1156,12 @@ PHP_FUNCTION(dom_document_get_elements_by_tag_name) { zval *id; xmlDocPtr docp; - int name_len; + zend_str_size_int name_len; dom_object *intern, *namednode; char *name; xmlChar *local; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_document_class_entry, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_document_class_entry, &name, &name_len) == FAILURE) { return; } @@ -1178,9 +1185,9 @@ PHP_FUNCTION(dom_document_import_node) xmlNodePtr nodep, retnodep; dom_object *intern, *nodeobj; int ret; - long recursive = 0; + php_int_t recursive = 0; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO|l", &id, dom_document_class_entry, &node, dom_node_class_entry, &recursive) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO|i", &id, dom_document_class_entry, &node, dom_node_class_entry, &recursive) == FAILURE) { return; } @@ -1232,13 +1239,14 @@ PHP_FUNCTION(dom_document_create_element_ns) xmlDocPtr docp; xmlNodePtr nodep = NULL; xmlNsPtr nsptr = NULL; - int ret, uri_len = 0, name_len = 0, value_len = 0; + int ret; + zend_str_size_int uri_len = 0, name_len = 0, value_len = 0; char *uri, *name, *value = NULL; char *localname = NULL, *prefix = NULL; int errorcode; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!s|s", &id, dom_document_class_entry, &uri, &uri_len, &name, &name_len, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS!S|S", &id, dom_document_class_entry, &uri, &uri_len, &name, &name_len, &value, &value_len) == FAILURE) { return; } @@ -1295,13 +1303,14 @@ PHP_FUNCTION(dom_document_create_attribute_ns) xmlDocPtr docp; xmlNodePtr nodep = NULL, root; xmlNsPtr nsptr; - int ret, uri_len = 0, name_len = 0; + int ret; + zend_str_size_int uri_len = 0, name_len = 0; char *uri, *name; char *localname = NULL, *prefix = NULL; dom_object *intern; int errorcode; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!s", &id, dom_document_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS!S", &id, dom_document_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { return; } @@ -1358,12 +1367,12 @@ PHP_FUNCTION(dom_document_get_elements_by_tag_name_ns) { zval *id; xmlDocPtr docp; - int uri_len, name_len; + zend_str_size_int uri_len, name_len; dom_object *intern, *namednode; char *uri, *name; xmlChar *local, *nsuri; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oss", &id, dom_document_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OSS", &id, dom_document_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { return; } @@ -1386,11 +1395,12 @@ PHP_FUNCTION(dom_document_get_element_by_id) zval *id; xmlDocPtr docp; xmlAttrPtr attrp; - int ret, idname_len; + int ret; + zend_str_size_int idname_len; dom_object *intern; char *idname; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_document_class_entry, &idname, &idname_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_document_class_entry, &idname, &idname_len) == FAILURE) { return; } @@ -1455,11 +1465,12 @@ PHP_METHOD(domdocument, __construct) xmlDoc *docp = NULL, *olddoc; dom_object *intern; char *encoding, *version = NULL; - int encoding_len = 0, version_len = 0, refcount; + zend_str_size_int encoding_len = 0, version_len = 0; + int refcount; zend_error_handling error_handling; zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|ss", &id, dom_document_class_entry, &version, &version_len, &encoding, &encoding_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|SS", &id, dom_document_class_entry, &version, &version_len, &encoding, &encoding_len) == FAILURE) { zend_restore_error_handling(&error_handling TSRMLS_CC); return; } @@ -1666,15 +1677,16 @@ static void dom_parse_document(INTERNAL_FUNCTION_PARAMETERS, int mode) { dom_doc_propsptr doc_prop; dom_object *intern; char *source; - int source_len, refcount, ret; - long options = 0; + zend_str_size_int source_len; + int refcount, ret; + php_int_t options = 0; id = getThis(); if (id != NULL && ! instanceof_function(Z_OBJCE_P(id), dom_document_class_entry TSRMLS_CC)) { id = NULL; } - 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|i", &source, &source_len, &options) == FAILURE) { return; } @@ -1745,13 +1757,14 @@ PHP_FUNCTION(dom_document_save) { zval *id; xmlDoc *docp; - int file_len = 0, bytes, format, saveempty = 0; + zend_str_size_int file_len = 0; + int bytes, format, saveempty = 0; dom_object *intern; dom_doc_propsptr doc_props; char *file; - long options = 0; + php_int_t options = 0; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os|l", &id, dom_document_class_entry, &file, &file_len, &options) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS|i", &id, dom_document_class_entry, &file, &file_len, &options) == FAILURE) { return; } @@ -1795,9 +1808,9 @@ PHP_FUNCTION(dom_document_savexml) dom_object *intern, *nodeobj; dom_doc_propsptr doc_props; int size, format, saveempty = 0; - long options = 0; + php_int_t options = 0; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|O!l", &id, dom_document_class_entry, &nodep, dom_node_class_entry, &options) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|O!i", &id, dom_document_class_entry, &nodep, dom_node_class_entry, &options) == FAILURE) { return; } @@ -1900,11 +1913,11 @@ PHP_FUNCTION(dom_document_xinclude) zval *id; xmlDoc *docp; xmlNodePtr root; - long flags = 0; + php_int_t flags = 0; int err; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|l", &id, dom_document_class_entry, &flags) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|i", &id, dom_document_class_entry, &flags) == FAILURE) { return; } @@ -1973,15 +1986,16 @@ static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type xmlDoc *docp; dom_object *intern; char *source = NULL, *valid_file = NULL; - int source_len = 0, valid_opts = 0; - long flags = 0; + zend_str_size_int source_len = 0; + int valid_opts = 0; + php_int_t flags = 0; xmlSchemaParserCtxtPtr parser; xmlSchemaPtr sptr; xmlSchemaValidCtxtPtr vptr; int is_valid; char resolved_path[MAXPATHLEN + 1]; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Op|l", &id, dom_document_class_entry, &source, &source_len, &flags) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OP|i", &id, dom_document_class_entry, &source, &source_len, &flags) == FAILURE) { return; } @@ -2070,14 +2084,14 @@ static void _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int typ xmlDoc *docp; dom_object *intern; char *source = NULL, *valid_file = NULL; - int source_len = 0; + zend_str_size_int source_len = 0; xmlRelaxNGParserCtxtPtr parser; xmlRelaxNGPtr sptr; xmlRelaxNGValidCtxtPtr vptr; int is_valid; char resolved_path[MAXPATHLEN + 1]; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Op", &id, dom_document_class_entry, &source, &source_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OP", &id, dom_document_class_entry, &source, &source_len) == FAILURE) { return; } @@ -2164,13 +2178,14 @@ static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */ dom_object *intern; dom_doc_propsptr doc_prop; char *source; - int source_len, refcount, ret; - long options = 0; + zend_str_size_int source_len; + int refcount, ret; + php_int_t options = 0; htmlParserCtxtPtr ctxt; id = getThis(); - 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|i", &source, &source_len, &options) == FAILURE) { return; } @@ -2262,13 +2277,14 @@ PHP_FUNCTION(dom_document_save_html_file) { zval *id; xmlDoc *docp; - int file_len, bytes, format; + zend_str_size_int file_len; + int bytes, format; dom_object *intern; dom_doc_propsptr doc_props; char *file; const char *encoding; - 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(), "OS", &id, dom_document_class_entry, &file, &file_len) == FAILURE) { return; } @@ -2372,11 +2388,11 @@ PHP_METHOD(domdocument, registerNodeClass) zval *id; xmlDoc *docp; char *baseclass = NULL, *extendedclass = NULL; - int baseclass_len = 0, extendedclass_len = 0; + zend_str_size_int baseclass_len = 0, extendedclass_len = 0; zend_class_entry *basece = NULL, *ce = NULL; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oss!", &id, dom_document_class_entry, &baseclass, &baseclass_len, &extendedclass, &extendedclass_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OSS!", &id, dom_document_class_entry, &baseclass, &baseclass_len, &extendedclass, &extendedclass_len) == FAILURE) { return; } diff --git a/ext/dom/documentfragment.c b/ext/dom/documentfragment.c index 4e8d660..fb380f4 100644 --- a/ext/dom/documentfragment.c +++ b/ext/dom/documentfragment.c @@ -124,11 +124,11 @@ PHP_METHOD(domdocumentfragment, appendXML) { xmlNode *nodep; dom_object *intern; char *data = NULL; - int data_len = 0; + zend_str_size_int data_len = 0; int err; xmlNodePtr lst; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_documentfragment_class_entry, &data, &data_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_documentfragment_class_entry, &data, &data_len) == FAILURE) { return; } diff --git a/ext/dom/domimplementation.c b/ext/dom/domimplementation.c index 5a32c60..f1dc3e7 100644 --- a/ext/dom/domimplementation.c +++ b/ext/dom/domimplementation.c @@ -70,10 +70,10 @@ Since: */ PHP_METHOD(domimplementation, hasFeature) { - int feature_len, version_len; + zend_str_size_int feature_len, version_len; char *feature, *version; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &feature, &feature_len, &version, &version_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS", &feature, &feature_len, &version, &version_len) == FAILURE) { return; } @@ -92,12 +92,13 @@ Since: DOM Level 2 PHP_METHOD(domimplementation, createDocumentType) { xmlDtd *doctype; - int ret, name_len = 0, publicid_len = 0, systemid_len = 0; + zend_str_size_int name_len = 0, publicid_len = 0, systemid_len = 0; + int ret; char *name = NULL, *publicid = NULL, *systemid = NULL; xmlChar *pch1 = NULL, *pch2 = NULL, *localname = NULL; xmlURIPtr uri; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sss", &name, &name_len, &publicid, &publicid_len, &systemid, &systemid_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|SSS", &name, &name_len, &publicid, &publicid_len, &systemid, &systemid_len) == FAILURE) { return; } @@ -155,12 +156,13 @@ PHP_METHOD(domimplementation, createDocument) xmlNode *nodep; xmlDtdPtr doctype = NULL; xmlNsPtr nsptr = NULL; - int ret, uri_len = 0, name_len = 0, errorcode = 0; + zend_str_size_int uri_len = 0, name_len = 0; + int ret, errorcode = 0; char *uri = NULL, *name = NULL; char *prefix = NULL, *localname = NULL; dom_object *doctobj; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ssO", &uri, &uri_len, &name, &name_len, &node, dom_documenttype_class_entry) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|SSO", &uri, &uri_len, &name, &name_len, &node, dom_documenttype_class_entry) == FAILURE) { return; } diff --git a/ext/dom/element.c b/ext/dom/element.c index 606a23f..d49f7ee 100644 --- a/ext/dom/element.c +++ b/ext/dom/element.c @@ -159,13 +159,13 @@ PHP_METHOD(domelement, __construct) dom_object *intern; char *name, *value = NULL, *uri = NULL; char *localname = NULL, *prefix = NULL; - int errorcode = 0, uri_len = 0; - int name_len, value_len = 0, name_valid; + int errorcode = 0, name_valid; + zend_str_size_int name_len, value_len = 0, uri_len = 0; xmlNsPtr nsptr = NULL; zend_error_handling error_handling; zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os|s!s", &id, dom_element_class_entry, &name, &name_len, &value, &value_len, &uri, &uri_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS|S!S", &id, dom_element_class_entry, &name, &name_len, &value, &value_len, &uri, &uri_len) == FAILURE) { zend_restore_error_handling(&error_handling TSRMLS_CC); return; } @@ -334,9 +334,9 @@ PHP_FUNCTION(dom_element_get_attribute) xmlChar *value = NULL; dom_object *intern; xmlNodePtr attr; - int name_len; + zend_str_size_int name_len; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { return; } @@ -374,11 +374,12 @@ PHP_FUNCTION(dom_element_set_attribute) zval *id; xmlNode *nodep; xmlNodePtr attr = NULL; - int ret, name_len, value_len, name_valid; + int ret, name_valid; + zend_str_size_int name_len, value_len; dom_object *intern; char *name, *value; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oss", &id, dom_element_class_entry, &name, &name_len, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OSS", &id, dom_element_class_entry, &name, &name_len, &value, &value_len) == FAILURE) { return; } @@ -440,10 +441,10 @@ PHP_FUNCTION(dom_element_remove_attribute) zval *id; xmlNodePtr nodep, attrp; dom_object *intern; - int name_len; + zend_str_size_int name_len; char *name; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { return; } @@ -487,11 +488,12 @@ PHP_FUNCTION(dom_element_get_attribute_node) { zval *id; xmlNodePtr nodep, attrp; - int name_len, ret; + zend_str_size_int name_len; + int ret; dom_object *intern; char *name; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { return; } @@ -636,12 +638,12 @@ PHP_FUNCTION(dom_element_get_elements_by_tag_name) { zval *id; xmlNodePtr elemp; - int name_len; + zend_str_size_int name_len; dom_object *intern, *namednode; char *name; xmlChar *local; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { return; } @@ -664,11 +666,11 @@ PHP_FUNCTION(dom_element_get_attribute_ns) xmlNodePtr elemp; xmlNsPtr nsptr; dom_object *intern; - int uri_len = 0, name_len = 0; + zend_str_size_int uri_len = 0, name_len = 0; char *uri, *name; xmlChar *strattr; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!s", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS!S", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { return; } @@ -744,13 +746,13 @@ PHP_FUNCTION(dom_element_set_attribute_ns) xmlNodePtr elemp, nodep = NULL; xmlNsPtr nsptr; xmlAttr *attr; - int uri_len = 0, name_len = 0, value_len = 0; + zend_str_size_int uri_len = 0, name_len = 0, value_len = 0; char *uri, *name, *value; char *localname = NULL, *prefix = NULL; dom_object *intern; int errorcode = 0, stricterror, is_xmlns = 0, name_valid; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!ss", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS!SS", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len, &value, &value_len) == FAILURE) { return; } @@ -873,10 +875,10 @@ PHP_FUNCTION(dom_element_remove_attribute_ns) xmlAttr *attrp; xmlNsPtr nsptr; dom_object *intern; - int name_len, uri_len; + zend_str_size_int name_len, uri_len; char *name, *uri; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!s", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS!S", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { return; } @@ -929,10 +931,11 @@ PHP_FUNCTION(dom_element_get_attribute_node_ns) xmlNodePtr elemp; xmlAttrPtr attrp; dom_object *intern; - int uri_len, name_len, ret; + zend_str_size_int uri_len, name_len; + int ret; char *uri, *name; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!s", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS!S", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { return; } @@ -1030,12 +1033,12 @@ PHP_FUNCTION(dom_element_get_elements_by_tag_name_ns) { zval *id; xmlNodePtr elemp; - int uri_len, name_len; + zend_str_size_int uri_len, name_len; dom_object *intern, *namednode; char *uri, *name; xmlChar *local, *nsuri; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oss", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OSS", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { return; } @@ -1060,10 +1063,10 @@ PHP_FUNCTION(dom_element_has_attribute) xmlNode *nodep; dom_object *intern; char *name; - int name_len; + zend_str_size_int name_len; xmlNodePtr attr; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { return; } @@ -1088,11 +1091,11 @@ PHP_FUNCTION(dom_element_has_attribute_ns) xmlNodePtr elemp; xmlNs *nsp; dom_object *intern; - int uri_len, name_len; + zend_str_size_int uri_len, name_len; char *uri, *name; xmlChar *value; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!s", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS!S", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { return; } @@ -1146,10 +1149,10 @@ PHP_FUNCTION(dom_element_set_id_attribute) xmlAttrPtr attrp; dom_object *intern; char *name; - int name_len; + zend_str_size_int name_len; zend_bool is_id; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Osb", &id, dom_element_class_entry, &name, &name_len, &is_id) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OSb", &id, dom_element_class_entry, &name, &name_len, &is_id) == FAILURE) { return; } @@ -1181,11 +1184,11 @@ PHP_FUNCTION(dom_element_set_id_attribute_ns) xmlNodePtr elemp; xmlAttrPtr attrp; dom_object *intern; - int uri_len, name_len; + zend_str_size_int uri_len, name_len; char *uri, *name; zend_bool is_id; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ossb", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len, &is_id) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OSSb", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len, &is_id) == FAILURE) { return; } diff --git a/ext/dom/entityreference.c b/ext/dom/entityreference.c index 4ef526c..df4bd05 100644 --- a/ext/dom/entityreference.c +++ b/ext/dom/entityreference.c @@ -53,11 +53,12 @@ PHP_METHOD(domentityreference, __construct) xmlNodePtr oldnode = NULL; dom_object *intern; char *name; - int name_len, name_valid; + zend_str_size_int name_len; + int name_valid; zend_error_handling error_handling; zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_entityreference_class_entry, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_entityreference_class_entry, &name, &name_len) == FAILURE) { zend_restore_error_handling(&error_handling TSRMLS_CC); return; } diff --git a/ext/dom/namednodemap.c b/ext/dom/namednodemap.c index 07d7c70..c3594df 100644 --- a/ext/dom/namednodemap.c +++ b/ext/dom/namednodemap.c @@ -127,7 +127,8 @@ Since: PHP_FUNCTION(dom_namednodemap_get_named_item) { zval *id; - int ret, namedlen=0; + int ret; + zend_str_size_int namedlen=0; dom_object *intern; xmlNodePtr itemnode = NULL; char *named; @@ -136,7 +137,7 @@ PHP_FUNCTION(dom_namednodemap_get_named_item) xmlNodePtr nodep; xmlNotation *notep = NULL; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_namednodemap_class_entry, &named, &namedlen) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_namednodemap_class_entry, &named, &namedlen) == FAILURE) { return; } @@ -201,7 +202,7 @@ Since: PHP_FUNCTION(dom_namednodemap_item) { zval *id; - long index; + php_int_t index; int ret; dom_object *intern; xmlNodePtr itemnode = NULL; @@ -210,7 +211,7 @@ PHP_FUNCTION(dom_namednodemap_item) xmlNodePtr nodep, curnode; int count; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &id, dom_namednodemap_class_entry, &index) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oi", &id, dom_namednodemap_class_entry, &index) == FAILURE) { return; } if (index >= 0) { @@ -259,7 +260,8 @@ Since: DOM Level 2 PHP_FUNCTION(dom_namednodemap_get_named_item_ns) { zval *id; - int ret, namedlen=0, urilen=0; + int ret; + zend_str_size_int namedlen=0, urilen=0; dom_object *intern; xmlNodePtr itemnode = NULL; char *uri, *named; @@ -268,7 +270,7 @@ PHP_FUNCTION(dom_namednodemap_get_named_item_ns) xmlNodePtr nodep; xmlNotation *notep = NULL; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!s", &id, dom_namednodemap_class_entry, &uri, &urilen, &named, &namedlen) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS!S", &id, dom_namednodemap_class_entry, &uri, &urilen, &named, &namedlen) == FAILURE) { return; } diff --git a/ext/dom/node.c b/ext/dom/node.c index 3279567..d4566f2 100644 --- a/ext/dom/node.c +++ b/ext/dom/node.c @@ -360,7 +360,7 @@ int dom_node_node_value_write(dom_object *obj, zval *newval TSRMLS_DC) } convert_to_string(newval); } - xmlNodeSetContentLen(nodep, Z_STRVAL_P(newval), Z_STRLEN_P(newval) + 1); + xmlNodeSetContentLen(nodep, Z_STRVAL_P(newval), Z_STRSIZE_P(newval) + 1); if (newval == &value_copy) { zval_dtor(newval); } @@ -1431,9 +1431,9 @@ PHP_FUNCTION(dom_node_clone_node) xmlNode *n, *node; int ret; dom_object *intern; - long recursive = 0; + php_int_t recursive = 0; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|l", &id, dom_node_class_entry, &recursive) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|i", &id, dom_node_class_entry, &recursive) == FAILURE) { return; } @@ -1510,10 +1510,10 @@ Since: DOM Level 2 PHP_FUNCTION(dom_node_is_supported) { zval *id; - int feature_len, version_len; + zend_str_size_int feature_len, version_len; char *feature, *version; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oss", &id, dom_node_class_entry, &feature, &feature_len, &version, &version_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OSS", &id, dom_node_class_entry, &feature, &feature_len, &version, &version_len) == FAILURE) { return; } @@ -1598,10 +1598,10 @@ PHP_FUNCTION(dom_node_lookup_prefix) xmlNodePtr nodep, lookupp = NULL; dom_object *intern; xmlNsPtr nsptr; - int uri_len = 0; + zend_str_size_int uri_len = 0; char *uri; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_node_class_entry, &uri, &uri_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_node_class_entry, &uri, &uri_len) == FAILURE) { return; } @@ -1648,10 +1648,10 @@ PHP_FUNCTION(dom_node_is_default_namespace) xmlNodePtr nodep; dom_object *intern; xmlNsPtr nsptr; - int uri_len = 0; + zend_str_size_int uri_len = 0; char *uri; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_node_class_entry, &uri, &uri_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_node_class_entry, &uri, &uri_len) == FAILURE) { return; } @@ -1681,10 +1681,10 @@ PHP_FUNCTION(dom_node_lookup_namespace_uri) xmlNodePtr nodep; dom_object *intern; xmlNsPtr nsptr; - int prefix_len = 0; + zend_str_size_int prefix_len = 0; char *prefix=NULL; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!", &id, dom_node_class_entry, &prefix, &prefix_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS!", &id, dom_node_class_entry, &prefix, &prefix_len) == FAILURE) { return; } @@ -1756,7 +1756,8 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ zend_bool exclusive=0, with_comments=0; xmlChar **inclusive_ns_prefixes = NULL; char *file = NULL; - int ret = -1, file_len = 0; + int ret = -1; + zend_str_size_int file_len = 0; xmlOutputBufferPtr buf; xmlXPathContextPtr ctxp=NULL; xmlXPathObjectPtr xpathobjp=NULL; @@ -1769,7 +1770,7 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ } } else { if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), - "Os|bba!a!", &id, dom_node_class_entry, &file, &file_len, &exclusive, + "OS|bba!a!", &id, dom_node_class_entry, &file, &file_len, &exclusive, &with_comments, &xpath_array, &ns_prefixes) == FAILURE) { return; } @@ -1824,8 +1825,8 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ while (zend_hash_get_current_data(Z_ARRVAL_PP(tmp), (void **)&tmpns) == SUCCESS) { if (Z_TYPE_PP(tmpns) == IS_STRING) { char *prefix; - ulong idx; - uint prefix_key_len; + php_uint_t idx; + zend_str_size_uint prefix_key_len; if (zend_hash_get_current_key_ex(Z_ARRVAL_PP(tmp), &prefix, &prefix_key_len, &idx, 0, NULL) == HASH_KEY_IS_STRING) { diff --git a/ext/dom/nodelist.c b/ext/dom/nodelist.c index d856f14..a0d4b35 100644 --- a/ext/dom/nodelist.c +++ b/ext/dom/nodelist.c @@ -105,7 +105,7 @@ Since: PHP_FUNCTION(dom_nodelist_item) { zval *id; - long index; + php_int_t index; int ret; dom_object *intern; xmlNodePtr itemnode = NULL; @@ -116,7 +116,7 @@ PHP_FUNCTION(dom_nodelist_item) HashTable *nodeht; zval **entry; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &id, dom_nodelist_class_entry, &index) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oi", &id, dom_nodelist_class_entry, &index) == FAILURE) { return; } diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c index db8ec83..afb9664 100644 --- a/ext/dom/php_dom.c +++ b/ext/dom/php_dom.c @@ -322,7 +322,7 @@ static zval **dom_get_property_ptr_ptr(zval *object, zval *member, int type, con obj = (dom_object *)zend_objects_get_address(object TSRMLS_CC); if (obj->prop_handler != NULL) { - ret = zend_hash_find(obj->prop_handler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void **) &hnd); + ret = zend_hash_find(obj->prop_handler, Z_STRVAL_P(member), Z_STRSIZE_P(member)+1, (void **) &hnd); } if (ret == FAILURE) { std_hnd = zend_get_std_object_handlers(); @@ -357,7 +357,7 @@ zval *dom_read_property(zval *object, zval *member, int type, const zend_literal obj = (dom_object *)zend_objects_get_address(object TSRMLS_CC); if (obj->prop_handler != NULL) { - ret = zend_hash_find(obj->prop_handler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void **) &hnd); + ret = zend_hash_find(obj->prop_handler, Z_STRVAL_P(member), Z_STRSIZE_P(member)+1, (void **) &hnd); } else if (instanceof_function(obj->std.ce, dom_node_class_entry TSRMLS_CC)) { php_error(E_WARNING, "Couldn't fetch %s. Node no longer exists", obj->std.ce->name); } @@ -402,7 +402,7 @@ void dom_write_property(zval *object, zval *member, zval *value, const zend_lite obj = (dom_object *)zend_objects_get_address(object TSRMLS_CC); if (obj->prop_handler != NULL) { - ret = zend_hash_find((HashTable *)obj->prop_handler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void **) &hnd); + ret = zend_hash_find((HashTable *)obj->prop_handler, Z_STRVAL_P(member), Z_STRSIZE_P(member)+1, (void **) &hnd); } if (ret == SUCCESS) { hnd->write_func(obj, value TSRMLS_CC); @@ -437,7 +437,7 @@ static int dom_property_exists(zval *object, zval *member, int check_empty, cons obj = (dom_object *)zend_objects_get_address(object TSRMLS_CC); if (obj->prop_handler != NULL) { - ret = zend_hash_find((HashTable *)obj->prop_handler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void **) &hnd); + ret = zend_hash_find((HashTable *)obj->prop_handler, Z_STRVAL_P(member), Z_STRSIZE_P(member)+1, (void **) &hnd); } if (ret == SUCCESS) { zval *tmp; @@ -502,8 +502,8 @@ static HashTable* dom_get_debug_info_helper(zval *object, int *is_temp TSRMLS_DC zend_hash_move_forward_ex(prop_handlers, &pos)) { zval *value; char *string_key = NULL; - uint string_length = 0; - ulong num_key; + zend_str_size_uint string_length = 0; + php_uint_t num_key; if (entry->read_func(obj, &value TSRMLS_CC) == FAILURE) { continue; diff --git a/ext/dom/processinginstruction.c b/ext/dom/processinginstruction.c index 976b693..310d600 100644 --- a/ext/dom/processinginstruction.c +++ b/ext/dom/processinginstruction.c @@ -55,11 +55,12 @@ PHP_METHOD(domprocessinginstruction, __construct) xmlNodePtr nodep = NULL, oldnode = NULL; dom_object *intern; char *name, *value = NULL; - int name_len, value_len, name_valid; + zend_str_size_int name_len, value_len; + int name_valid; zend_error_handling error_handling; zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os|s", &id, dom_processinginstruction_class_entry, &name, &name_len, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS|S", &id, dom_processinginstruction_class_entry, &name, &name_len, &value, &value_len) == FAILURE) { zend_restore_error_handling(&error_handling TSRMLS_CC); return; } @@ -165,7 +166,7 @@ int dom_processinginstruction_data_write(dom_object *obj, zval *newval TSRMLS_DC convert_to_string(newval); } - xmlNodeSetContentLen(nodep, Z_STRVAL_P(newval), Z_STRLEN_P(newval) + 1); + xmlNodeSetContentLen(nodep, Z_STRVAL_P(newval), Z_STRSIZE_P(newval) + 1); if (newval == &value_copy) { zval_dtor(newval); diff --git a/ext/dom/text.c b/ext/dom/text.c index f608997..4fea1ee 100644 --- a/ext/dom/text.c +++ b/ext/dom/text.c @@ -69,11 +69,11 @@ PHP_METHOD(domtext, __construct) xmlNodePtr nodep = NULL, oldnode = NULL; dom_object *intern; char *value = NULL; - int value_len; + zend_str_size_int value_len; zend_error_handling error_handling; zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|s", &id, dom_text_class_entry, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|S", &id, dom_text_class_entry, &value, &value_len) == FAILURE) { zend_restore_error_handling(&error_handling TSRMLS_CC); return; } @@ -150,12 +150,12 @@ PHP_FUNCTION(dom_text_split_text) xmlChar *second; xmlNodePtr node; xmlNodePtr nnode; - long offset; + php_int_t offset; int ret; int length; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &id, dom_text_class_entry, &offset) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oi", &id, dom_text_class_entry, &offset) == FAILURE) { return; } DOM_GET_OBJ(node, id, xmlNodePtr, intern); diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c index d12ef30..cc30820 100644 --- a/ext/dom/xpath.c +++ b/ext/dom/xpath.c @@ -349,11 +349,11 @@ PHP_FUNCTION(dom_xpath_register_ns) { zval *id; xmlXPathContextPtr ctxp; - int prefix_len, ns_uri_len; + zend_str_size_int prefix_len, ns_uri_len; dom_xpath_object *intern; unsigned char *prefix, *ns_uri; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oss", &id, dom_xpath_class_entry, &prefix, &prefix_len, &ns_uri, &ns_uri_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OSS", &id, dom_xpath_class_entry, &prefix, &prefix_len, &ns_uri, &ns_uri_len) == FAILURE) { return; } @@ -389,7 +389,8 @@ static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */ xmlXPathContextPtr ctxp; xmlNodePtr nodep = NULL; xmlXPathObjectPtr xpathobjp; - int expr_len, ret, nsnbr = 0, xpath_type; + zend_str_size_int expr_len; + int ret, nsnbr = 0, xpath_type; dom_xpath_object *intern; dom_object *nodeobj; char *expr; @@ -397,7 +398,7 @@ static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */ xmlNsPtr *ns = NULL; zend_bool register_node_ns = 1; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os|O!b", &id, dom_xpath_class_entry, &expr, &expr_len, &context, dom_node_class_entry, ®ister_node_ns) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS|O!b", &id, dom_xpath_class_entry, &expr, &expr_len, &context, dom_node_class_entry, ®ister_node_ns) == FAILURE) { return; } @@ -550,7 +551,7 @@ PHP_FUNCTION(dom_xpath_register_php_functions) zval *id; dom_xpath_object *intern; zval *array_value, **entry, *new_string; - int name_len = 0; + zend_str_size_int name_len = 0; char *name; DOM_GET_THIS(id); @@ -566,13 +567,13 @@ PHP_FUNCTION(dom_xpath_register_php_functions) MAKE_STD_ZVAL(new_string); ZVAL_LONG(new_string,1); - zend_hash_update(intern->registered_phpfunctions, Z_STRVAL_PP(entry), Z_STRLEN_PP(entry) + 1, &new_string, sizeof(zval*), NULL); + zend_hash_update(intern->registered_phpfunctions, Z_STRVAL_PP(entry), Z_STRSIZE_PP(entry) + 1, &new_string, sizeof(zval*), NULL); zend_hash_move_forward(Z_ARRVAL_P(array_value)); } intern->registerPhpFunctions = 2; RETURN_TRUE; - } else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "s", &name, &name_len) == SUCCESS) { + } else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "S", &name, &name_len) == SUCCESS) { intern = (dom_xpath_object *)zend_object_store_get_object(id TSRMLS_CC); MAKE_STD_ZVAL(new_string);
diff --git a/ext/dom/attr.c b/ext/dom/attr.c index d45ca88..128c711 100644 --- a/ext/dom/attr.c +++ b/ext/dom/attr.c @@ -61,11 +61,12 @@ PHP_METHOD(domattr, __construct) xmlNodePtr oldnode = NULL; dom_object *intern; char *name, *value = NULL; - int name_len, value_len, name_valid; + zend_str_size_int name_len, value_len; + int name_valid; zend_error_handling error_handling; zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os|s", &id, dom_attr_class_entry, &name, &name_len, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS|S", &id, dom_attr_class_entry, &name, &name_len, &value, &value_len) == FAILURE) { zend_restore_error_handling(&error_handling TSRMLS_CC); return; } @@ -192,7 +193,7 @@ int dom_attr_value_write(dom_object *obj, zval *newval TSRMLS_DC) convert_to_string(newval); } - xmlNodeSetContentLen((xmlNodePtr) attrp, Z_STRVAL_P(newval), Z_STRLEN_P(newval) + 1); + xmlNodeSetContentLen((xmlNodePtr) attrp, Z_STRVAL_P(newval), Z_STRSIZE_P(newval) + 1); if (newval == &value_copy) { zval_dtor(newval); diff --git a/ext/dom/cdatasection.c b/ext/dom/cdatasection.c index dc8a3f1..ffa0147 100644 --- a/ext/dom/cdatasection.c +++ b/ext/dom/cdatasection.c @@ -54,11 +54,11 @@ PHP_METHOD(domcdatasection, __construct) xmlNodePtr nodep = NULL, oldnode = NULL; dom_object *intern; char *value = NULL; - int value_len; + zend_str_size_int value_len; zend_error_handling error_handling; zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_cdatasection_class_entry, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_cdatasection_class_entry, &value, &value_len) == FAILURE) { zend_restore_error_handling(&error_handling TSRMLS_CC); return; } diff --git a/ext/dom/characterdata.c b/ext/dom/characterdata.c index 3b1f9b1..c7eb0e2 100644 --- a/ext/dom/characterdata.c +++ b/ext/dom/characterdata.c @@ -121,7 +121,7 @@ int dom_characterdata_data_write(dom_object *obj, zval *newval TSRMLS_DC) convert_to_string(newval); } - xmlNodeSetContentLen(nodep, Z_STRVAL_P(newval), Z_STRLEN_P(newval) + 1); + xmlNodeSetContentLen(nodep, Z_STRVAL_P(newval), Z_STRSIZE_P(newval) + 1); if (newval == &value_copy) { zval_dtor(newval); @@ -176,11 +176,11 @@ PHP_FUNCTION(dom_characterdata_substring_data) xmlChar *cur; xmlChar *substring; xmlNodePtr node; - long offset, count; + php_int_t offset, count; int length; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oll", &id, dom_characterdata_class_entry, &offset, &count) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oii", &id, dom_characterdata_class_entry, &offset, &count) == FAILURE) { return; } @@ -225,9 +225,9 @@ PHP_FUNCTION(dom_characterdata_append_data) xmlNode *nodep; dom_object *intern; char *arg; - int arg_len; + zend_str_size_int arg_len; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_characterdata_class_entry, &arg, &arg_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_characterdata_class_entry, &arg, &arg_len) == FAILURE) { return; } @@ -259,11 +259,12 @@ PHP_FUNCTION(dom_characterdata_insert_data) xmlChar *cur, *first, *second; xmlNodePtr node; char *arg; - long offset; - int length, arg_len; + php_int_t offset; + int length; + zend_str_size_int arg_len; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ols", &id, dom_characterdata_class_entry, &offset, &arg, &arg_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OiS", &id, dom_characterdata_class_entry, &offset, &arg, &arg_len) == FAILURE) { return; } @@ -306,11 +307,11 @@ PHP_FUNCTION(dom_characterdata_delete_data) zval *id; xmlChar *cur, *substring, *second; xmlNodePtr node; - long offset, count; + php_int_t offset, count; int length; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oll", &id, dom_characterdata_class_entry, &offset, &count) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oii", &id, dom_characterdata_class_entry, &offset, &count) == FAILURE) { return; } @@ -362,11 +363,12 @@ PHP_FUNCTION(dom_characterdata_replace_data) xmlChar *cur, *substring, *second = NULL; xmlNodePtr node; char *arg; - long offset, count; - int length, arg_len; + php_int_t offset, count; + int length; + zend_str_size_int arg_len; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Olls", &id, dom_characterdata_class_entry, &offset, &count, &arg, &arg_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OiiS", &id, dom_characterdata_class_entry, &offset, &count, &arg, &arg_len) == FAILURE) { return; } diff --git a/ext/dom/comment.c b/ext/dom/comment.c index 017c2ba..fe265d8 100644 --- a/ext/dom/comment.c +++ b/ext/dom/comment.c @@ -54,11 +54,11 @@ PHP_METHOD(domcomment, __construct) xmlNodePtr nodep = NULL, oldnode = NULL; dom_object *intern; char *value = NULL; - int value_len; + zend_str_size_int value_len; zend_error_handling error_handling; zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|s", &id, dom_comment_class_entry, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|S", &id, dom_comment_class_entry, &value, &value_len) == FAILURE) { zend_restore_error_handling(&error_handling TSRMLS_CC); return; } diff --git a/ext/dom/document.c b/ext/dom/document.c index efe6d90..dad98f7 100644 --- a/ext/dom/document.c +++ b/ext/dom/document.c @@ -905,10 +905,11 @@ PHP_FUNCTION(dom_document_create_element) xmlNode *node; xmlDocPtr docp; dom_object *intern; - int ret, name_len, value_len; + int ret; + zend_str_size_int name_len, value_len; char *name, *value = NULL; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os|s", &id, dom_document_class_entry, &name, &name_len, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS|S", &id, dom_document_class_entry, &name, &name_len, &value, &value_len) == FAILURE) { return; } @@ -964,11 +965,12 @@ PHP_FUNCTION(dom_document_create_text_node) zval *id; xmlNode *node; xmlDocPtr docp; - int ret, value_len; + int ret; + zend_str_size_int value_len; dom_object *intern; char *value; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_document_class_entry, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_document_class_entry, &value, &value_len) == FAILURE) { return; } @@ -992,11 +994,12 @@ PHP_FUNCTION(dom_document_create_comment) zval *id; xmlNode *node; xmlDocPtr docp; - int ret, value_len; + int ret; + zend_str_size_int value_len; dom_object *intern; char *value; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_document_class_entry, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_document_class_entry, &value, &value_len) == FAILURE) { return; } @@ -1020,11 +1023,12 @@ PHP_FUNCTION(dom_document_create_cdatasection) zval *id; xmlNode *node; xmlDocPtr docp; - int ret, value_len; + int ret; + zend_str_size_int value_len; dom_object *intern; char *value; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_document_class_entry, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_document_class_entry, &value, &value_len) == FAILURE) { return; } @@ -1048,11 +1052,12 @@ PHP_FUNCTION(dom_document_create_processing_instruction) zval *id; xmlNode *node; xmlDocPtr docp; - int ret, value_len, name_len = 0; + int ret; + zend_str_size_int value_len, name_len = 0; dom_object *intern; char *name, *value = NULL; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os|s", &id, dom_document_class_entry, &name, &name_len, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS|S", &id, dom_document_class_entry, &name, &name_len, &value, &value_len) == FAILURE) { return; } @@ -1083,11 +1088,12 @@ PHP_FUNCTION(dom_document_create_attribute) zval *id; xmlAttrPtr node; xmlDocPtr docp; - int ret, name_len; + int ret; + zend_str_size_int name_len; dom_object *intern; char *name; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_document_class_entry, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_document_class_entry, &name, &name_len) == FAILURE) { return; } @@ -1118,10 +1124,11 @@ PHP_FUNCTION(dom_document_create_entity_reference) xmlNode *node; xmlDocPtr docp = NULL; dom_object *intern; - int ret, name_len; + int ret; + zend_str_size_int name_len; char *name; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_document_class_entry, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_document_class_entry, &name, &name_len) == FAILURE) { return; } @@ -1149,12 +1156,12 @@ PHP_FUNCTION(dom_document_get_elements_by_tag_name) { zval *id; xmlDocPtr docp; - int name_len; + zend_str_size_int name_len; dom_object *intern, *namednode; char *name; xmlChar *local; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_document_class_entry, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_document_class_entry, &name, &name_len) == FAILURE) { return; } @@ -1178,9 +1185,9 @@ PHP_FUNCTION(dom_document_import_node) xmlNodePtr nodep, retnodep; dom_object *intern, *nodeobj; int ret; - long recursive = 0; + php_int_t recursive = 0; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO|l", &id, dom_document_class_entry, &node, dom_node_class_entry, &recursive) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO|i", &id, dom_document_class_entry, &node, dom_node_class_entry, &recursive) == FAILURE) { return; } @@ -1232,13 +1239,14 @@ PHP_FUNCTION(dom_document_create_element_ns) xmlDocPtr docp; xmlNodePtr nodep = NULL; xmlNsPtr nsptr = NULL; - int ret, uri_len = 0, name_len = 0, value_len = 0; + int ret; + zend_str_size_int uri_len = 0, name_len = 0, value_len = 0; char *uri, *name, *value = NULL; char *localname = NULL, *prefix = NULL; int errorcode; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!s|s", &id, dom_document_class_entry, &uri, &uri_len, &name, &name_len, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS!S|S", &id, dom_document_class_entry, &uri, &uri_len, &name, &name_len, &value, &value_len) == FAILURE) { return; } @@ -1295,13 +1303,14 @@ PHP_FUNCTION(dom_document_create_attribute_ns) xmlDocPtr docp; xmlNodePtr nodep = NULL, root; xmlNsPtr nsptr; - int ret, uri_len = 0, name_len = 0; + int ret; + zend_str_size_int uri_len = 0, name_len = 0; char *uri, *name; char *localname = NULL, *prefix = NULL; dom_object *intern; int errorcode; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!s", &id, dom_document_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS!S", &id, dom_document_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { return; } @@ -1358,12 +1367,12 @@ PHP_FUNCTION(dom_document_get_elements_by_tag_name_ns) { zval *id; xmlDocPtr docp; - int uri_len, name_len; + zend_str_size_int uri_len, name_len; dom_object *intern, *namednode; char *uri, *name; xmlChar *local, *nsuri; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oss", &id, dom_document_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OSS", &id, dom_document_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { return; } @@ -1386,11 +1395,12 @@ PHP_FUNCTION(dom_document_get_element_by_id) zval *id; xmlDocPtr docp; xmlAttrPtr attrp; - int ret, idname_len; + int ret; + zend_str_size_int idname_len; dom_object *intern; char *idname; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_document_class_entry, &idname, &idname_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_document_class_entry, &idname, &idname_len) == FAILURE) { return; } @@ -1455,11 +1465,12 @@ PHP_METHOD(domdocument, __construct) xmlDoc *docp = NULL, *olddoc; dom_object *intern; char *encoding, *version = NULL; - int encoding_len = 0, version_len = 0, refcount; + zend_str_size_int encoding_len = 0, version_len = 0; + int refcount; zend_error_handling error_handling; zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|ss", &id, dom_document_class_entry, &version, &version_len, &encoding, &encoding_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|SS", &id, dom_document_class_entry, &version, &version_len, &encoding, &encoding_len) == FAILURE) { zend_restore_error_handling(&error_handling TSRMLS_CC); return; } @@ -1666,15 +1677,16 @@ static void dom_parse_document(INTERNAL_FUNCTION_PARAMETERS, int mode) { dom_doc_propsptr doc_prop; dom_object *intern; char *source; - int source_len, refcount, ret; - long options = 0; + zend_str_size_int source_len; + int refcount, ret; + php_int_t options = 0; id = getThis(); if (id != NULL && ! instanceof_function(Z_OBJCE_P(id), dom_document_class_entry TSRMLS_CC)) { id = NULL; } - 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|i", &source, &source_len, &options) == FAILURE) { return; } @@ -1745,13 +1757,14 @@ PHP_FUNCTION(dom_document_save) { zval *id; xmlDoc *docp; - int file_len = 0, bytes, format, saveempty = 0; + zend_str_size_int file_len = 0; + int bytes, format, saveempty = 0; dom_object *intern; dom_doc_propsptr doc_props; char *file; - long options = 0; + php_int_t options = 0; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os|l", &id, dom_document_class_entry, &file, &file_len, &options) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS|i", &id, dom_document_class_entry, &file, &file_len, &options) == FAILURE) { return; } @@ -1795,9 +1808,9 @@ PHP_FUNCTION(dom_document_savexml) dom_object *intern, *nodeobj; dom_doc_propsptr doc_props; int size, format, saveempty = 0; - long options = 0; + php_int_t options = 0; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|O!l", &id, dom_document_class_entry, &nodep, dom_node_class_entry, &options) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|O!i", &id, dom_document_class_entry, &nodep, dom_node_class_entry, &options) == FAILURE) { return; } @@ -1900,11 +1913,11 @@ PHP_FUNCTION(dom_document_xinclude) zval *id; xmlDoc *docp; xmlNodePtr root; - long flags = 0; + php_int_t flags = 0; int err; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|l", &id, dom_document_class_entry, &flags) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|i", &id, dom_document_class_entry, &flags) == FAILURE) { return; } @@ -1973,15 +1986,16 @@ static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type xmlDoc *docp; dom_object *intern; char *source = NULL, *valid_file = NULL; - int source_len = 0, valid_opts = 0; - long flags = 0; + zend_str_size_int source_len = 0; + int valid_opts = 0; + php_int_t flags = 0; xmlSchemaParserCtxtPtr parser; xmlSchemaPtr sptr; xmlSchemaValidCtxtPtr vptr; int is_valid; char resolved_path[MAXPATHLEN + 1]; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Op|l", &id, dom_document_class_entry, &source, &source_len, &flags) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OP|i", &id, dom_document_class_entry, &source, &source_len, &flags) == FAILURE) { return; } @@ -2070,14 +2084,14 @@ static void _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int typ xmlDoc *docp; dom_object *intern; char *source = NULL, *valid_file = NULL; - int source_len = 0; + zend_str_size_int source_len = 0; xmlRelaxNGParserCtxtPtr parser; xmlRelaxNGPtr sptr; xmlRelaxNGValidCtxtPtr vptr; int is_valid; char resolved_path[MAXPATHLEN + 1]; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Op", &id, dom_document_class_entry, &source, &source_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OP", &id, dom_document_class_entry, &source, &source_len) == FAILURE) { return; } @@ -2164,13 +2178,14 @@ static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */ dom_object *intern; dom_doc_propsptr doc_prop; char *source; - int source_len, refcount, ret; - long options = 0; + zend_str_size_int source_len; + int refcount, ret; + php_int_t options = 0; htmlParserCtxtPtr ctxt; id = getThis(); - 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|i", &source, &source_len, &options) == FAILURE) { return; } @@ -2262,13 +2277,14 @@ PHP_FUNCTION(dom_document_save_html_file) { zval *id; xmlDoc *docp; - int file_len, bytes, format; + zend_str_size_int file_len; + int bytes, format; dom_object *intern; dom_doc_propsptr doc_props; char *file; const char *encoding; - 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(), "OS", &id, dom_document_class_entry, &file, &file_len) == FAILURE) { return; } @@ -2372,11 +2388,11 @@ PHP_METHOD(domdocument, registerNodeClass) zval *id; xmlDoc *docp; char *baseclass = NULL, *extendedclass = NULL; - int baseclass_len = 0, extendedclass_len = 0; + zend_str_size_int baseclass_len = 0, extendedclass_len = 0; zend_class_entry *basece = NULL, *ce = NULL; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oss!", &id, dom_document_class_entry, &baseclass, &baseclass_len, &extendedclass, &extendedclass_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OSS!", &id, dom_document_class_entry, &baseclass, &baseclass_len, &extendedclass, &extendedclass_len) == FAILURE) { return; } diff --git a/ext/dom/documentfragment.c b/ext/dom/documentfragment.c index 4e8d660..fb380f4 100644 --- a/ext/dom/documentfragment.c +++ b/ext/dom/documentfragment.c @@ -124,11 +124,11 @@ PHP_METHOD(domdocumentfragment, appendXML) { xmlNode *nodep; dom_object *intern; char *data = NULL; - int data_len = 0; + zend_str_size_int data_len = 0; int err; xmlNodePtr lst; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_documentfragment_class_entry, &data, &data_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_documentfragment_class_entry, &data, &data_len) == FAILURE) { return; } diff --git a/ext/dom/domimplementation.c b/ext/dom/domimplementation.c index 5a32c60..f1dc3e7 100644 --- a/ext/dom/domimplementation.c +++ b/ext/dom/domimplementation.c @@ -70,10 +70,10 @@ Since: */ PHP_METHOD(domimplementation, hasFeature) { - int feature_len, version_len; + zend_str_size_int feature_len, version_len; char *feature, *version; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &feature, &feature_len, &version, &version_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS", &feature, &feature_len, &version, &version_len) == FAILURE) { return; } @@ -92,12 +92,13 @@ Since: DOM Level 2 PHP_METHOD(domimplementation, createDocumentType) { xmlDtd *doctype; - int ret, name_len = 0, publicid_len = 0, systemid_len = 0; + zend_str_size_int name_len = 0, publicid_len = 0, systemid_len = 0; + int ret; char *name = NULL, *publicid = NULL, *systemid = NULL; xmlChar *pch1 = NULL, *pch2 = NULL, *localname = NULL; xmlURIPtr uri; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sss", &name, &name_len, &publicid, &publicid_len, &systemid, &systemid_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|SSS", &name, &name_len, &publicid, &publicid_len, &systemid, &systemid_len) == FAILURE) { return; } @@ -155,12 +156,13 @@ PHP_METHOD(domimplementation, createDocument) xmlNode *nodep; xmlDtdPtr doctype = NULL; xmlNsPtr nsptr = NULL; - int ret, uri_len = 0, name_len = 0, errorcode = 0; + zend_str_size_int uri_len = 0, name_len = 0; + int ret, errorcode = 0; char *uri = NULL, *name = NULL; char *prefix = NULL, *localname = NULL; dom_object *doctobj; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ssO", &uri, &uri_len, &name, &name_len, &node, dom_documenttype_class_entry) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|SSO", &uri, &uri_len, &name, &name_len, &node, dom_documenttype_class_entry) == FAILURE) { return; } diff --git a/ext/dom/element.c b/ext/dom/element.c index 606a23f..d49f7ee 100644 --- a/ext/dom/element.c +++ b/ext/dom/element.c @@ -159,13 +159,13 @@ PHP_METHOD(domelement, __construct) dom_object *intern; char *name, *value = NULL, *uri = NULL; char *localname = NULL, *prefix = NULL; - int errorcode = 0, uri_len = 0; - int name_len, value_len = 0, name_valid; + int errorcode = 0, name_valid; + zend_str_size_int name_len, value_len = 0, uri_len = 0; xmlNsPtr nsptr = NULL; zend_error_handling error_handling; zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os|s!s", &id, dom_element_class_entry, &name, &name_len, &value, &value_len, &uri, &uri_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS|S!S", &id, dom_element_class_entry, &name, &name_len, &value, &value_len, &uri, &uri_len) == FAILURE) { zend_restore_error_handling(&error_handling TSRMLS_CC); return; } @@ -334,9 +334,9 @@ PHP_FUNCTION(dom_element_get_attribute) xmlChar *value = NULL; dom_object *intern; xmlNodePtr attr; - int name_len; + zend_str_size_int name_len; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { return; } @@ -374,11 +374,12 @@ PHP_FUNCTION(dom_element_set_attribute) zval *id; xmlNode *nodep; xmlNodePtr attr = NULL; - int ret, name_len, value_len, name_valid; + int ret, name_valid; + zend_str_size_int name_len, value_len; dom_object *intern; char *name, *value; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oss", &id, dom_element_class_entry, &name, &name_len, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OSS", &id, dom_element_class_entry, &name, &name_len, &value, &value_len) == FAILURE) { return; } @@ -440,10 +441,10 @@ PHP_FUNCTION(dom_element_remove_attribute) zval *id; xmlNodePtr nodep, attrp; dom_object *intern; - int name_len; + zend_str_size_int name_len; char *name; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { return; } @@ -487,11 +488,12 @@ PHP_FUNCTION(dom_element_get_attribute_node) { zval *id; xmlNodePtr nodep, attrp; - int name_len, ret; + zend_str_size_int name_len; + int ret; dom_object *intern; char *name; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { return; } @@ -636,12 +638,12 @@ PHP_FUNCTION(dom_element_get_elements_by_tag_name) { zval *id; xmlNodePtr elemp; - int name_len; + zend_str_size_int name_len; dom_object *intern, *namednode; char *name; xmlChar *local; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { return; } @@ -664,11 +666,11 @@ PHP_FUNCTION(dom_element_get_attribute_ns) xmlNodePtr elemp; xmlNsPtr nsptr; dom_object *intern; - int uri_len = 0, name_len = 0; + zend_str_size_int uri_len = 0, name_len = 0; char *uri, *name; xmlChar *strattr; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!s", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS!S", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { return; } @@ -744,13 +746,13 @@ PHP_FUNCTION(dom_element_set_attribute_ns) xmlNodePtr elemp, nodep = NULL; xmlNsPtr nsptr; xmlAttr *attr; - int uri_len = 0, name_len = 0, value_len = 0; + zend_str_size_int uri_len = 0, name_len = 0, value_len = 0; char *uri, *name, *value; char *localname = NULL, *prefix = NULL; dom_object *intern; int errorcode = 0, stricterror, is_xmlns = 0, name_valid; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!ss", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS!SS", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len, &value, &value_len) == FAILURE) { return; } @@ -873,10 +875,10 @@ PHP_FUNCTION(dom_element_remove_attribute_ns) xmlAttr *attrp; xmlNsPtr nsptr; dom_object *intern; - int name_len, uri_len; + zend_str_size_int name_len, uri_len; char *name, *uri; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!s", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS!S", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { return; } @@ -929,10 +931,11 @@ PHP_FUNCTION(dom_element_get_attribute_node_ns) xmlNodePtr elemp; xmlAttrPtr attrp; dom_object *intern; - int uri_len, name_len, ret; + zend_str_size_int uri_len, name_len; + int ret; char *uri, *name; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!s", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS!S", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { return; } @@ -1030,12 +1033,12 @@ PHP_FUNCTION(dom_element_get_elements_by_tag_name_ns) { zval *id; xmlNodePtr elemp; - int uri_len, name_len; + zend_str_size_int uri_len, name_len; dom_object *intern, *namednode; char *uri, *name; xmlChar *local, *nsuri; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oss", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OSS", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { return; } @@ -1060,10 +1063,10 @@ PHP_FUNCTION(dom_element_has_attribute) xmlNode *nodep; dom_object *intern; char *name; - int name_len; + zend_str_size_int name_len; xmlNodePtr attr; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { return; } @@ -1088,11 +1091,11 @@ PHP_FUNCTION(dom_element_has_attribute_ns) xmlNodePtr elemp; xmlNs *nsp; dom_object *intern; - int uri_len, name_len; + zend_str_size_int uri_len, name_len; char *uri, *name; xmlChar *value; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!s", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS!S", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { return; } @@ -1146,10 +1149,10 @@ PHP_FUNCTION(dom_element_set_id_attribute) xmlAttrPtr attrp; dom_object *intern; char *name; - int name_len; + zend_str_size_int name_len; zend_bool is_id; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Osb", &id, dom_element_class_entry, &name, &name_len, &is_id) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OSb", &id, dom_element_class_entry, &name, &name_len, &is_id) == FAILURE) { return; } @@ -1181,11 +1184,11 @@ PHP_FUNCTION(dom_element_set_id_attribute_ns) xmlNodePtr elemp; xmlAttrPtr attrp; dom_object *intern; - int uri_len, name_len; + zend_str_size_int uri_len, name_len; char *uri, *name; zend_bool is_id; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ossb", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len, &is_id) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OSSb", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len, &is_id) == FAILURE) { return; } diff --git a/ext/dom/entityreference.c b/ext/dom/entityreference.c index 4ef526c..df4bd05 100644 --- a/ext/dom/entityreference.c +++ b/ext/dom/entityreference.c @@ -53,11 +53,12 @@ PHP_METHOD(domentityreference, __construct) xmlNodePtr oldnode = NULL; dom_object *intern; char *name; - int name_len, name_valid; + zend_str_size_int name_len; + int name_valid; zend_error_handling error_handling; zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_entityreference_class_entry, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_entityreference_class_entry, &name, &name_len) == FAILURE) { zend_restore_error_handling(&error_handling TSRMLS_CC); return; } diff --git a/ext/dom/namednodemap.c b/ext/dom/namednodemap.c index 07d7c70..c3594df 100644 --- a/ext/dom/namednodemap.c +++ b/ext/dom/namednodemap.c @@ -127,7 +127,8 @@ Since: PHP_FUNCTION(dom_namednodemap_get_named_item) { zval *id; - int ret, namedlen=0; + int ret; + zend_str_size_int namedlen=0; dom_object *intern; xmlNodePtr itemnode = NULL; char *named; @@ -136,7 +137,7 @@ PHP_FUNCTION(dom_namednodemap_get_named_item) xmlNodePtr nodep; xmlNotation *notep = NULL; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_namednodemap_class_entry, &named, &namedlen) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_namednodemap_class_entry, &named, &namedlen) == FAILURE) { return; } @@ -201,7 +202,7 @@ Since: PHP_FUNCTION(dom_namednodemap_item) { zval *id; - long index; + php_int_t index; int ret; dom_object *intern; xmlNodePtr itemnode = NULL; @@ -210,7 +211,7 @@ PHP_FUNCTION(dom_namednodemap_item) xmlNodePtr nodep, curnode; int count; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &id, dom_namednodemap_class_entry, &index) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oi", &id, dom_namednodemap_class_entry, &index) == FAILURE) { return; } if (index >= 0) { @@ -259,7 +260,8 @@ Since: DOM Level 2 PHP_FUNCTION(dom_namednodemap_get_named_item_ns) { zval *id; - int ret, namedlen=0, urilen=0; + int ret; + zend_str_size_int namedlen=0, urilen=0; dom_object *intern; xmlNodePtr itemnode = NULL; char *uri, *named; @@ -268,7 +270,7 @@ PHP_FUNCTION(dom_namednodemap_get_named_item_ns) xmlNodePtr nodep; xmlNotation *notep = NULL; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!s", &id, dom_namednodemap_class_entry, &uri, &urilen, &named, &namedlen) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS!S", &id, dom_namednodemap_class_entry, &uri, &urilen, &named, &namedlen) == FAILURE) { return; } diff --git a/ext/dom/node.c b/ext/dom/node.c index 3279567..d4566f2 100644 --- a/ext/dom/node.c +++ b/ext/dom/node.c @@ -360,7 +360,7 @@ int dom_node_node_value_write(dom_object *obj, zval *newval TSRMLS_DC) } convert_to_string(newval); } - xmlNodeSetContentLen(nodep, Z_STRVAL_P(newval), Z_STRLEN_P(newval) + 1); + xmlNodeSetContentLen(nodep, Z_STRVAL_P(newval), Z_STRSIZE_P(newval) + 1); if (newval == &value_copy) { zval_dtor(newval); } @@ -1431,9 +1431,9 @@ PHP_FUNCTION(dom_node_clone_node) xmlNode *n, *node; int ret; dom_object *intern; - long recursive = 0; + php_int_t recursive = 0; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|l", &id, dom_node_class_entry, &recursive) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|i", &id, dom_node_class_entry, &recursive) == FAILURE) { return; } @@ -1510,10 +1510,10 @@ Since: DOM Level 2 PHP_FUNCTION(dom_node_is_supported) { zval *id; - int feature_len, version_len; + zend_str_size_int feature_len, version_len; char *feature, *version; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oss", &id, dom_node_class_entry, &feature, &feature_len, &version, &version_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OSS", &id, dom_node_class_entry, &feature, &feature_len, &version, &version_len) == FAILURE) { return; } @@ -1598,10 +1598,10 @@ PHP_FUNCTION(dom_node_lookup_prefix) xmlNodePtr nodep, lookupp = NULL; dom_object *intern; xmlNsPtr nsptr; - int uri_len = 0; + zend_str_size_int uri_len = 0; char *uri; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_node_class_entry, &uri, &uri_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_node_class_entry, &uri, &uri_len) == FAILURE) { return; } @@ -1648,10 +1648,10 @@ PHP_FUNCTION(dom_node_is_default_namespace) xmlNodePtr nodep; dom_object *intern; xmlNsPtr nsptr; - int uri_len = 0; + zend_str_size_int uri_len = 0; char *uri; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_node_class_entry, &uri, &uri_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS", &id, dom_node_class_entry, &uri, &uri_len) == FAILURE) { return; } @@ -1681,10 +1681,10 @@ PHP_FUNCTION(dom_node_lookup_namespace_uri) xmlNodePtr nodep; dom_object *intern; xmlNsPtr nsptr; - int prefix_len = 0; + zend_str_size_int prefix_len = 0; char *prefix=NULL; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!", &id, dom_node_class_entry, &prefix, &prefix_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS!", &id, dom_node_class_entry, &prefix, &prefix_len) == FAILURE) { return; } @@ -1756,7 +1756,8 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ zend_bool exclusive=0, with_comments=0; xmlChar **inclusive_ns_prefixes = NULL; char *file = NULL; - int ret = -1, file_len = 0; + int ret = -1; + zend_str_size_int file_len = 0; xmlOutputBufferPtr buf; xmlXPathContextPtr ctxp=NULL; xmlXPathObjectPtr xpathobjp=NULL; @@ -1769,7 +1770,7 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ } } else { if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), - "Os|bba!a!", &id, dom_node_class_entry, &file, &file_len, &exclusive, + "OS|bba!a!", &id, dom_node_class_entry, &file, &file_len, &exclusive, &with_comments, &xpath_array, &ns_prefixes) == FAILURE) { return; } @@ -1824,8 +1825,8 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ while (zend_hash_get_current_data(Z_ARRVAL_PP(tmp), (void **)&tmpns) == SUCCESS) { if (Z_TYPE_PP(tmpns) == IS_STRING) { char *prefix; - ulong idx; - uint prefix_key_len; + php_uint_t idx; + zend_str_size_uint prefix_key_len; if (zend_hash_get_current_key_ex(Z_ARRVAL_PP(tmp), &prefix, &prefix_key_len, &idx, 0, NULL) == HASH_KEY_IS_STRING) { diff --git a/ext/dom/nodelist.c b/ext/dom/nodelist.c index d856f14..a0d4b35 100644 --- a/ext/dom/nodelist.c +++ b/ext/dom/nodelist.c @@ -105,7 +105,7 @@ Since: PHP_FUNCTION(dom_nodelist_item) { zval *id; - long index; + php_int_t index; int ret; dom_object *intern; xmlNodePtr itemnode = NULL; @@ -116,7 +116,7 @@ PHP_FUNCTION(dom_nodelist_item) HashTable *nodeht; zval **entry; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &id, dom_nodelist_class_entry, &index) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oi", &id, dom_nodelist_class_entry, &index) == FAILURE) { return; } diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c index db8ec83..afb9664 100644 --- a/ext/dom/php_dom.c +++ b/ext/dom/php_dom.c @@ -322,7 +322,7 @@ static zval **dom_get_property_ptr_ptr(zval *object, zval *member, int type, con obj = (dom_object *)zend_objects_get_address(object TSRMLS_CC); if (obj->prop_handler != NULL) { - ret = zend_hash_find(obj->prop_handler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void **) &hnd); + ret = zend_hash_find(obj->prop_handler, Z_STRVAL_P(member), Z_STRSIZE_P(member)+1, (void **) &hnd); } if (ret == FAILURE) { std_hnd = zend_get_std_object_handlers(); @@ -357,7 +357,7 @@ zval *dom_read_property(zval *object, zval *member, int type, const zend_literal obj = (dom_object *)zend_objects_get_address(object TSRMLS_CC); if (obj->prop_handler != NULL) { - ret = zend_hash_find(obj->prop_handler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void **) &hnd); + ret = zend_hash_find(obj->prop_handler, Z_STRVAL_P(member), Z_STRSIZE_P(member)+1, (void **) &hnd); } else if (instanceof_function(obj->std.ce, dom_node_class_entry TSRMLS_CC)) { php_error(E_WARNING, "Couldn't fetch %s. Node no longer exists", obj->std.ce->name); } @@ -402,7 +402,7 @@ void dom_write_property(zval *object, zval *member, zval *value, const zend_lite obj = (dom_object *)zend_objects_get_address(object TSRMLS_CC); if (obj->prop_handler != NULL) { - ret = zend_hash_find((HashTable *)obj->prop_handler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void **) &hnd); + ret = zend_hash_find((HashTable *)obj->prop_handler, Z_STRVAL_P(member), Z_STRSIZE_P(member)+1, (void **) &hnd); } if (ret == SUCCESS) { hnd->write_func(obj, value TSRMLS_CC); @@ -437,7 +437,7 @@ static int dom_property_exists(zval *object, zval *member, int check_empty, cons obj = (dom_object *)zend_objects_get_address(object TSRMLS_CC); if (obj->prop_handler != NULL) { - ret = zend_hash_find((HashTable *)obj->prop_handler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void **) &hnd); + ret = zend_hash_find((HashTable *)obj->prop_handler, Z_STRVAL_P(member), Z_STRSIZE_P(member)+1, (void **) &hnd); } if (ret == SUCCESS) { zval *tmp; @@ -502,8 +502,8 @@ static HashTable* dom_get_debug_info_helper(zval *object, int *is_temp TSRMLS_DC zend_hash_move_forward_ex(prop_handlers, &pos)) { zval *value; char *string_key = NULL; - uint string_length = 0; - ulong num_key; + zend_str_size_uint string_length = 0; + php_uint_t num_key; if (entry->read_func(obj, &value TSRMLS_CC) == FAILURE) { continue; diff --git a/ext/dom/processinginstruction.c b/ext/dom/processinginstruction.c index 976b693..310d600 100644 --- a/ext/dom/processinginstruction.c +++ b/ext/dom/processinginstruction.c @@ -55,11 +55,12 @@ PHP_METHOD(domprocessinginstruction, __construct) xmlNodePtr nodep = NULL, oldnode = NULL; dom_object *intern; char *name, *value = NULL; - int name_len, value_len, name_valid; + zend_str_size_int name_len, value_len; + int name_valid; zend_error_handling error_handling; zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os|s", &id, dom_processinginstruction_class_entry, &name, &name_len, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS|S", &id, dom_processinginstruction_class_entry, &name, &name_len, &value, &value_len) == FAILURE) { zend_restore_error_handling(&error_handling TSRMLS_CC); return; } @@ -165,7 +166,7 @@ int dom_processinginstruction_data_write(dom_object *obj, zval *newval TSRMLS_DC convert_to_string(newval); } - xmlNodeSetContentLen(nodep, Z_STRVAL_P(newval), Z_STRLEN_P(newval) + 1); + xmlNodeSetContentLen(nodep, Z_STRVAL_P(newval), Z_STRSIZE_P(newval) + 1); if (newval == &value_copy) { zval_dtor(newval); diff --git a/ext/dom/text.c b/ext/dom/text.c index f608997..4fea1ee 100644 --- a/ext/dom/text.c +++ b/ext/dom/text.c @@ -69,11 +69,11 @@ PHP_METHOD(domtext, __construct) xmlNodePtr nodep = NULL, oldnode = NULL; dom_object *intern; char *value = NULL; - int value_len; + zend_str_size_int value_len; zend_error_handling error_handling; zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC); - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|s", &id, dom_text_class_entry, &value, &value_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|S", &id, dom_text_class_entry, &value, &value_len) == FAILURE) { zend_restore_error_handling(&error_handling TSRMLS_CC); return; } @@ -150,12 +150,12 @@ PHP_FUNCTION(dom_text_split_text) xmlChar *second; xmlNodePtr node; xmlNodePtr nnode; - long offset; + php_int_t offset; int ret; int length; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &id, dom_text_class_entry, &offset) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oi", &id, dom_text_class_entry, &offset) == FAILURE) { return; } DOM_GET_OBJ(node, id, xmlNodePtr, intern); diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c index d12ef30..cc30820 100644 --- a/ext/dom/xpath.c +++ b/ext/dom/xpath.c @@ -349,11 +349,11 @@ PHP_FUNCTION(dom_xpath_register_ns) { zval *id; xmlXPathContextPtr ctxp; - int prefix_len, ns_uri_len; + zend_str_size_int prefix_len, ns_uri_len; dom_xpath_object *intern; unsigned char *prefix, *ns_uri; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oss", &id, dom_xpath_class_entry, &prefix, &prefix_len, &ns_uri, &ns_uri_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OSS", &id, dom_xpath_class_entry, &prefix, &prefix_len, &ns_uri, &ns_uri_len) == FAILURE) { return; } @@ -389,7 +389,8 @@ static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */ xmlXPathContextPtr ctxp; xmlNodePtr nodep = NULL; xmlXPathObjectPtr xpathobjp; - int expr_len, ret, nsnbr = 0, xpath_type; + zend_str_size_int expr_len; + int ret, nsnbr = 0, xpath_type; dom_xpath_object *intern; dom_object *nodeobj; char *expr; @@ -397,7 +398,7 @@ static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */ xmlNsPtr *ns = NULL; zend_bool register_node_ns = 1; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os|O!b", &id, dom_xpath_class_entry, &expr, &expr_len, &context, dom_node_class_entry, ®ister_node_ns) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OS|O!b", &id, dom_xpath_class_entry, &expr, &expr_len, &context, dom_node_class_entry, ®ister_node_ns) == FAILURE) { return; } @@ -550,7 +551,7 @@ PHP_FUNCTION(dom_xpath_register_php_functions) zval *id; dom_xpath_object *intern; zval *array_value, **entry, *new_string; - int name_len = 0; + zend_str_size_int name_len = 0; char *name; DOM_GET_THIS(id); @@ -566,13 +567,13 @@ PHP_FUNCTION(dom_xpath_register_php_functions) MAKE_STD_ZVAL(new_string); ZVAL_LONG(new_string,1); - zend_hash_update(intern->registered_phpfunctions, Z_STRVAL_PP(entry), Z_STRLEN_PP(entry) + 1, &new_string, sizeof(zval*), NULL); + zend_hash_update(intern->registered_phpfunctions, Z_STRVAL_PP(entry), Z_STRSIZE_PP(entry) + 1, &new_string, sizeof(zval*), NULL); zend_hash_move_forward(Z_ARRVAL_P(array_value)); } intern->registerPhpFunctions = 2; RETURN_TRUE; - } else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "s", &name, &name_len) == SUCCESS) { + } else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "S", &name, &name_len) == SUCCESS) { intern = (dom_xpath_object *)zend_object_store_get_object(id TSRMLS_CC); MAKE_STD_ZVAL(new_string);