diff options
author | Dmitry Stogov <dmitry@zend.com> | 2018-11-14 03:32:19 +0300 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2018-11-14 03:32:19 +0300 |
commit | 54a7d03934d7b4b1b8fbc025579d275dea2bb8c2 (patch) | |
tree | f9bd1179177c74a5bcc268c2074cae90ad462187 /ext | |
parent | c6ad0b92b7d8e66a07cf75ed4abc39fe3e13e00d (diff) | |
download | php-git-54a7d03934d7b4b1b8fbc025579d275dea2bb8c2.tar.gz |
Replace zend_parse_method_parameters() by zend_parse_parameters() and avoid useless checks.
Diffstat (limited to 'ext')
-rw-r--r-- | ext/dom/attr.c | 3 | ||||
-rw-r--r-- | ext/dom/characterdata.c | 15 | ||||
-rw-r--r-- | ext/dom/document.c | 74 | ||||
-rw-r--r-- | ext/dom/documentfragment.c | 3 | ||||
-rw-r--r-- | ext/dom/element.c | 54 | ||||
-rw-r--r-- | ext/dom/namednodemap.c | 12 | ||||
-rw-r--r-- | ext/dom/node.c | 48 | ||||
-rw-r--r-- | ext/dom/nodelist.c | 6 | ||||
-rw-r--r-- | ext/dom/text.c | 6 | ||||
-rw-r--r-- | ext/dom/xml_common.h | 5 | ||||
-rw-r--r-- | ext/dom/xpath.c | 6 | ||||
-rw-r--r-- | ext/xsl/xsltprocessor.c | 3 |
12 files changed, 152 insertions, 83 deletions
diff --git a/ext/dom/attr.c b/ext/dom/attr.c index 3de5fc3643..706ae06576 100644 --- a/ext/dom/attr.c +++ b/ext/dom/attr.c @@ -227,7 +227,8 @@ PHP_FUNCTION(dom_attr_is_id) dom_object *intern; xmlAttrPtr attrp; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &id, dom_attr_class_entry) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters_none() == FAILURE) { return; } diff --git a/ext/dom/characterdata.c b/ext/dom/characterdata.c index ccaaf20d27..f2e2dcbe04 100644 --- a/ext/dom/characterdata.c +++ b/ext/dom/characterdata.c @@ -158,7 +158,8 @@ PHP_FUNCTION(dom_characterdata_substring_data) int length; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oll", &id, dom_characterdata_class_entry, &offset, &count) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "ll", &offset, &count) == FAILURE) { return; } @@ -205,7 +206,8 @@ PHP_FUNCTION(dom_characterdata_append_data) char *arg; size_t arg_len; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_characterdata_class_entry, &arg, &arg_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &arg, &arg_len) == FAILURE) { return; } @@ -230,7 +232,8 @@ PHP_FUNCTION(dom_characterdata_insert_data) size_t arg_len; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Ols", &id, dom_characterdata_class_entry, &offset, &arg, &arg_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "ls", &offset, &arg, &arg_len) == FAILURE) { return; } @@ -277,7 +280,8 @@ PHP_FUNCTION(dom_characterdata_delete_data) int length; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oll", &id, dom_characterdata_class_entry, &offset, &count) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "ll", &offset, &count) == FAILURE) { return; } @@ -334,7 +338,8 @@ PHP_FUNCTION(dom_characterdata_replace_data) size_t arg_len; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Olls", &id, dom_characterdata_class_entry, &offset, &count, &arg, &arg_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "lls", &offset, &count, &arg, &arg_len) == FAILURE) { return; } diff --git a/ext/dom/document.c b/ext/dom/document.c index 104888d5b4..9258e5b0fa 100644 --- a/ext/dom/document.c +++ b/ext/dom/document.c @@ -700,7 +700,8 @@ PHP_FUNCTION(dom_document_create_element) size_t name_len, value_len; char *name, *value = NULL; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os|s", &id, dom_document_class_entry, &name, &name_len, &value, &value_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|s", &name, &name_len, &value, &value_len) == FAILURE) { return; } @@ -732,7 +733,8 @@ PHP_FUNCTION(dom_document_create_document_fragment) dom_object *intern; int ret; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &id, dom_document_class_entry) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters_none() == FAILURE) { return; } @@ -761,7 +763,8 @@ PHP_FUNCTION(dom_document_create_text_node) dom_object *intern; char *value; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_document_class_entry, &value, &value_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &value, &value_len) == FAILURE) { return; } @@ -790,7 +793,8 @@ PHP_FUNCTION(dom_document_create_comment) dom_object *intern; char *value; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_document_class_entry, &value, &value_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &value, &value_len) == FAILURE) { return; } @@ -819,7 +823,8 @@ PHP_FUNCTION(dom_document_create_cdatasection) dom_object *intern; char *value; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_document_class_entry, &value, &value_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &value, &value_len) == FAILURE) { return; } @@ -848,7 +853,8 @@ PHP_FUNCTION(dom_document_create_processing_instruction) dom_object *intern; char *name, *value = NULL; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os|s", &id, dom_document_class_entry, &name, &name_len, &value, &value_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|s", &name, &name_len, &value, &value_len) == FAILURE) { return; } @@ -884,7 +890,8 @@ PHP_FUNCTION(dom_document_create_attribute) dom_object *intern; char *name; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_document_class_entry, &name, &name_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name, &name_len) == FAILURE) { return; } @@ -919,7 +926,8 @@ PHP_FUNCTION(dom_document_create_entity_reference) size_t name_len; char *name; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_document_class_entry, &name, &name_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name, &name_len) == FAILURE) { return; } @@ -952,7 +960,8 @@ PHP_FUNCTION(dom_document_get_elements_by_tag_name) char *name; xmlChar *local; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_document_class_entry, &name, &name_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name, &name_len) == FAILURE) { return; } @@ -978,7 +987,8 @@ PHP_FUNCTION(dom_document_import_node) int ret; zend_bool recursive = 0; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO|b", &id, dom_document_class_entry, &node, dom_node_class_entry, &recursive) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|b", &node, dom_node_class_entry, &recursive) == FAILURE) { return; } @@ -1037,7 +1047,8 @@ PHP_FUNCTION(dom_document_create_element_ns) int errorcode; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os!s|s", &id, dom_document_class_entry, &uri, &uri_len, &name, &name_len, &value, &value_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s!s|s", &uri, &uri_len, &name, &name_len, &value, &value_len) == FAILURE) { return; } @@ -1101,7 +1112,8 @@ PHP_FUNCTION(dom_document_create_attribute_ns) dom_object *intern; int errorcode; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os!s", &id, dom_document_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s!s", &uri, &uri_len, &name, &name_len) == FAILURE) { return; } @@ -1163,7 +1175,8 @@ PHP_FUNCTION(dom_document_get_elements_by_tag_name_ns) char *uri, *name; xmlChar *local, *nsuri; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oss", &id, dom_document_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss", &uri, &uri_len, &name, &name_len) == FAILURE) { return; } @@ -1191,7 +1204,8 @@ PHP_FUNCTION(dom_document_get_element_by_id) dom_object *intern; char *idname; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_document_class_entry, &idname, &idname_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &idname, &idname_len) == FAILURE) { return; } @@ -1228,7 +1242,8 @@ PHP_FUNCTION(dom_document_normalize_document) xmlDocPtr docp; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &id, dom_document_class_entry) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters_none() == FAILURE) { return; } @@ -1567,7 +1582,8 @@ PHP_FUNCTION(dom_document_save) char *file; zend_long options = 0; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Op|l", &id, dom_document_class_entry, &file, &file_len, &options) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "p|l", &file, &file_len, &options) == FAILURE) { return; } @@ -1613,7 +1629,8 @@ PHP_FUNCTION(dom_document_savexml) int size, format, saveempty = 0; zend_long options = 0; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|O!l", &id, dom_document_class_entry, &nodep, dom_node_class_entry, &options) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|O!l", &nodep, dom_node_class_entry, &options) == FAILURE) { return; } @@ -1720,7 +1737,8 @@ PHP_FUNCTION(dom_document_xinclude) int err; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|l", &id, dom_document_class_entry, &flags) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &flags) == FAILURE) { return; } @@ -1764,7 +1782,8 @@ PHP_FUNCTION(dom_document_validate) dom_object *intern; xmlValidCtxt *cvp; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &id, dom_document_class_entry) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters_none() == FAILURE) { return; } @@ -1803,7 +1822,8 @@ static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type int is_valid; char resolved_path[MAXPATHLEN + 1]; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os|l", &id, dom_document_class_entry, &source, &source_len, &flags) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|l", &source, &source_len, &flags) == FAILURE) { return; } @@ -1901,7 +1921,8 @@ static void _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int typ int is_valid; char resolved_path[MAXPATHLEN + 1]; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_document_class_entry, &source, &source_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &source, &source_len) == FAILURE) { return; } @@ -2111,7 +2132,8 @@ PHP_FUNCTION(dom_document_save_html_file) char *file; const char *encoding; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Op", &id, dom_document_class_entry, &file, &file_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "p", &file, &file_len) == FAILURE) { return; } @@ -2151,8 +2173,9 @@ PHP_FUNCTION(dom_document_save_html) int format; dom_doc_propsptr doc_props; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), - "O|O!", &id, dom_document_class_entry, &nodep, dom_node_class_entry) + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), + "|O!", &nodep, dom_node_class_entry) == FAILURE) { return; } @@ -2233,7 +2256,8 @@ PHP_METHOD(domdocument, registerNodeClass) zend_class_entry *basece = dom_node_class_entry, *ce = NULL; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OCC!", &id, dom_document_class_entry, &basece, &ce) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "CC!", &basece, &ce) == FAILURE) { return; } diff --git a/ext/dom/documentfragment.c b/ext/dom/documentfragment.c index 5d9b89764d..645b11754a 100644 --- a/ext/dom/documentfragment.c +++ b/ext/dom/documentfragment.c @@ -118,7 +118,8 @@ PHP_METHOD(domdocumentfragment, appendXML) { int err; xmlNodePtr lst; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_documentfragment_class_entry, &data, &data_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &data, &data_len) == FAILURE) { return; } diff --git a/ext/dom/element.c b/ext/dom/element.c index 9c60dba090..5e7db385a5 100644 --- a/ext/dom/element.c +++ b/ext/dom/element.c @@ -325,7 +325,8 @@ PHP_FUNCTION(dom_element_get_attribute) xmlNodePtr attr; size_t name_len; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name, &name_len) == FAILURE) { return; } @@ -368,7 +369,8 @@ PHP_FUNCTION(dom_element_set_attribute) dom_object *intern; char *name, *value; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oss", &id, dom_element_class_entry, &name, &name_len, &value, &value_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss", &name, &name_len, &value, &value_len) == FAILURE) { return; } @@ -433,7 +435,8 @@ PHP_FUNCTION(dom_element_remove_attribute) size_t name_len; char *name; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name, &name_len) == FAILURE) { return; } @@ -482,7 +485,8 @@ PHP_FUNCTION(dom_element_get_attribute_node) dom_object *intern; char *name; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name, &name_len) == FAILURE) { return; } @@ -528,7 +532,8 @@ PHP_FUNCTION(dom_element_set_attribute_node) dom_object *intern, *attrobj, *oldobj; int ret; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO", &id, dom_element_class_entry, &node, dom_attr_class_entry) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &node, dom_attr_class_entry) == FAILURE) { return; } @@ -594,7 +599,8 @@ PHP_FUNCTION(dom_element_remove_attribute_node) dom_object *intern, *attrobj; int ret; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO", &id, dom_element_class_entry, &node, dom_attr_class_entry) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &node, dom_attr_class_entry) == FAILURE) { return; } @@ -632,7 +638,8 @@ PHP_FUNCTION(dom_element_get_elements_by_tag_name) char *name; xmlChar *local; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name, &name_len) == FAILURE) { return; } @@ -659,7 +666,8 @@ PHP_FUNCTION(dom_element_get_attribute_ns) char *uri, *name; xmlChar *strattr; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os!s", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s!s", &uri, &uri_len, &name, &name_len) == FAILURE) { return; } @@ -741,7 +749,8 @@ PHP_FUNCTION(dom_element_set_attribute_ns) dom_object *intern; int errorcode = 0, stricterror, is_xmlns = 0, name_valid; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os!ss", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len, &value, &value_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s!ss", &uri, &uri_len, &name, &name_len, &value, &value_len) == FAILURE) { return; } @@ -867,7 +876,8 @@ PHP_FUNCTION(dom_element_remove_attribute_ns) size_t name_len, uri_len; char *name, *uri; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os!s", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s!s", &uri, &uri_len, &name, &name_len) == FAILURE) { return; } @@ -924,7 +934,8 @@ PHP_FUNCTION(dom_element_get_attribute_node_ns) int ret; char *uri, *name; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os!s", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s!s", &uri, &uri_len, &name, &name_len) == FAILURE) { return; } @@ -978,7 +989,8 @@ PHP_FUNCTION(dom_element_set_attribute_node_ns) dom_object *intern, *attrobj, *oldobj; int ret; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO", &id, dom_element_class_entry, &node, dom_attr_class_entry) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &node, dom_attr_class_entry) == FAILURE) { return; } @@ -1051,7 +1063,8 @@ PHP_FUNCTION(dom_element_get_elements_by_tag_name_ns) char *uri, *name; xmlChar *local, *nsuri; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oss", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss", &uri, &uri_len, &name, &name_len) == FAILURE) { return; } @@ -1079,7 +1092,8 @@ PHP_FUNCTION(dom_element_has_attribute) size_t name_len; xmlNodePtr attr; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name, &name_len) == FAILURE) { return; } @@ -1108,7 +1122,8 @@ PHP_FUNCTION(dom_element_has_attribute_ns) char *uri, *name; xmlChar *value; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os!s", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s!s", &uri, &uri_len, &name, &name_len) == FAILURE) { return; } @@ -1165,7 +1180,8 @@ PHP_FUNCTION(dom_element_set_id_attribute) size_t name_len; zend_bool is_id; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Osb", &id, dom_element_class_entry, &name, &name_len, &is_id) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "sb", &name, &name_len, &is_id) == FAILURE) { return; } @@ -1201,7 +1217,8 @@ PHP_FUNCTION(dom_element_set_id_attribute_ns) char *uri, *name; zend_bool is_id; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Ossb", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len, &is_id) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "ssb", &uri, &uri_len, &name, &name_len, &is_id) == FAILURE) { return; } @@ -1235,7 +1252,8 @@ PHP_FUNCTION(dom_element_set_id_attribute_node) dom_object *intern, *attrobj; zend_bool is_id; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OOb", &id, dom_element_class_entry, &node, dom_attr_class_entry, &is_id) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ob", &node, dom_attr_class_entry, &is_id) == FAILURE) { return; } diff --git a/ext/dom/namednodemap.c b/ext/dom/namednodemap.c index 19a15730a9..6926ee2fd3 100644 --- a/ext/dom/namednodemap.c +++ b/ext/dom/namednodemap.c @@ -138,7 +138,8 @@ PHP_FUNCTION(dom_namednodemap_get_named_item) xmlNodePtr nodep; xmlNotation *notep = NULL; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_namednodemap_class_entry, &named, &namedlen) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &named, &namedlen) == FAILURE) { return; } @@ -212,7 +213,8 @@ PHP_FUNCTION(dom_namednodemap_item) xmlNodePtr nodep, curnode; int count; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Ol", &id, dom_namednodemap_class_entry, &index) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &index) == FAILURE) { return; } if (index >= 0) { @@ -276,7 +278,8 @@ PHP_FUNCTION(dom_namednodemap_get_named_item_ns) xmlNodePtr nodep; xmlNotation *notep = NULL; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os!s", &id, dom_namednodemap_class_entry, &uri, &urilen, &named, &namedlen) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s!s", &uri, &urilen, &named, &namedlen) == FAILURE) { return; } @@ -341,7 +344,8 @@ PHP_FUNCTION(dom_namednodemap_count) zval *id; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &id, dom_namednodemap_class_entry) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters_none() == FAILURE) { return; } diff --git a/ext/dom/node.c b/ext/dom/node.c index 0e7f64a9bd..cca472eb95 100644 --- a/ext/dom/node.c +++ b/ext/dom/node.c @@ -929,7 +929,8 @@ PHP_FUNCTION(dom_node_insert_before) dom_object *intern, *childobj, *refpobj; int ret, stricterror; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO|O!", &id, dom_node_class_entry, &node, dom_node_class_entry, &ref, dom_node_class_entry) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|O!", &node, dom_node_class_entry, &ref, dom_node_class_entry) == FAILURE) { return; } @@ -1092,7 +1093,8 @@ PHP_FUNCTION(dom_node_replace_child) int ret; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OOO", &id, dom_node_class_entry, &newnode, dom_node_class_entry, &oldnode, dom_node_class_entry) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "OO", &newnode, dom_node_class_entry, &oldnode, dom_node_class_entry) == FAILURE) { return; } @@ -1178,7 +1180,8 @@ PHP_FUNCTION(dom_node_remove_child) dom_object *intern, *childobj; int ret, stricterror; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO", &id, dom_node_class_entry, &node, dom_node_class_entry) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &node, dom_node_class_entry) == FAILURE) { return; } @@ -1229,7 +1232,8 @@ PHP_FUNCTION(dom_node_append_child) dom_object *intern, *childobj; int ret, stricterror; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO", &id, dom_node_class_entry, &node, dom_node_class_entry) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &node, dom_node_class_entry) == FAILURE) { return; } @@ -1329,7 +1333,8 @@ PHP_FUNCTION(dom_node_has_child_nodes) xmlNode *nodep; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &id, dom_node_class_entry) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters_none() == FAILURE) { return; } @@ -1359,7 +1364,8 @@ PHP_FUNCTION(dom_node_clone_node) dom_object *intern; zend_bool recursive = 0; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|b", &id, dom_node_class_entry, &recursive) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|b", &recursive) == FAILURE) { return; } @@ -1418,7 +1424,8 @@ PHP_FUNCTION(dom_node_normalize) xmlNode *nodep; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &id, dom_node_class_entry) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters_none() == FAILURE) { return; } @@ -1435,11 +1442,10 @@ Since: DOM Level 2 */ PHP_FUNCTION(dom_node_is_supported) { - zval *id; size_t feature_len, version_len; char *feature, *version; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oss", &id, dom_node_class_entry, &feature, &feature_len, &version, &version_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss", &feature, &feature_len, &version, &version_len) == FAILURE) { return; } @@ -1461,7 +1467,8 @@ PHP_FUNCTION(dom_node_has_attributes) xmlNode *nodep; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &id, dom_node_class_entry) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters_none() == FAILURE) { return; } @@ -1498,7 +1505,8 @@ PHP_FUNCTION(dom_node_is_same_node) xmlNodePtr nodeotherp, nodep; dom_object *intern, *nodeotherobj; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO", &id, dom_node_class_entry, &node, dom_node_class_entry) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &node, dom_node_class_entry) == FAILURE) { return; } @@ -1527,7 +1535,8 @@ PHP_FUNCTION(dom_node_lookup_prefix) size_t uri_len = 0; char *uri; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_node_class_entry, &uri, &uri_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &uri, &uri_len) == FAILURE) { return; } @@ -1578,7 +1587,8 @@ PHP_FUNCTION(dom_node_is_default_namespace) size_t uri_len = 0; char *uri; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &id, dom_node_class_entry, &uri, &uri_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &uri, &uri_len) == FAILURE) { return; } @@ -1611,7 +1621,8 @@ PHP_FUNCTION(dom_node_lookup_namespace_uri) size_t prefix_len; char *prefix; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os!", &id, dom_node_class_entry, &prefix, &prefix_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s!", &prefix, &prefix_len) == FAILURE) { return; } @@ -1689,15 +1700,16 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ xmlXPathContextPtr ctxp=NULL; xmlXPathObjectPtr xpathobjp=NULL; + id = &EX(This); if (mode == 0) { - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), - "O|bba!a!", &id, dom_node_class_entry, &exclusive, &with_comments, + if (zend_parse_parameters(ZEND_NUM_ARGS(), + "|bba!a!", &exclusive, &with_comments, &xpath_array, &ns_prefixes) == FAILURE) { return; } } else { - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), - "Os|bba!a!", &id, dom_node_class_entry, &file, &file_len, &exclusive, + if (zend_parse_parameters(ZEND_NUM_ARGS(), + "s|bba!a!", &file, &file_len, &exclusive, &with_comments, &xpath_array, &ns_prefixes) == FAILURE) { return; } diff --git a/ext/dom/nodelist.c b/ext/dom/nodelist.c index 6cb15150c8..3078c1abbe 100644 --- a/ext/dom/nodelist.c +++ b/ext/dom/nodelist.c @@ -109,7 +109,8 @@ PHP_FUNCTION(dom_nodelist_count) zval *id; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &id, dom_nodelist_class_entry) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters_none() == FAILURE) { return; } @@ -138,7 +139,8 @@ PHP_FUNCTION(dom_nodelist_item) xmlNodePtr nodep, curnode; int count = 0; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Ol", &id, dom_nodelist_class_entry, &index) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &index) == FAILURE) { return; } diff --git a/ext/dom/text.c b/ext/dom/text.c index 631397312a..4c4abc9a89 100644 --- a/ext/dom/text.c +++ b/ext/dom/text.c @@ -145,7 +145,8 @@ PHP_FUNCTION(dom_text_split_text) int length; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Ol", &id, dom_text_class_entry, &offset) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &offset) == FAILURE) { return; } DOM_GET_OBJ(node, id, xmlNodePtr, intern); @@ -200,7 +201,8 @@ PHP_FUNCTION(dom_text_is_whitespace_in_element_content) xmlNodePtr node; dom_object *intern; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &id, dom_text_class_entry) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters_none() == FAILURE) { return; } DOM_GET_OBJ(node, id, xmlNodePtr, intern); diff --git a/ext/dom/xml_common.h b/ext/dom/xml_common.h index 35536a2bf5..e0acde1564 100644 --- a/ext/dom/xml_common.h +++ b/ext/dom/xml_common.h @@ -84,10 +84,7 @@ PHP_DOM_EXPORT xmlNodePtr dom_object_get_node(dom_object *obj); *ret = php_dom_create_object(obj, return_value, domobject) #define DOM_GET_THIS(zval) \ - if (NULL == (zval = getThis())) { \ - php_error_docref(NULL, E_WARNING, "Underlying object missing"); \ - RETURN_FALSE; \ - } + do { zval = &EX(This); } while (0) #define DOM_GET_THIS_OBJ(__ptr, __id, __prtype, __intern) \ DOM_GET_THIS(__id); \ diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c index 195b30ce11..8453b33899 100644 --- a/ext/dom/xpath.c +++ b/ext/dom/xpath.c @@ -315,7 +315,8 @@ PHP_FUNCTION(dom_xpath_register_ns) dom_xpath_object *intern; unsigned char *prefix, *ns_uri; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oss", &id, dom_xpath_class_entry, &prefix, &prefix_len, &ns_uri, &ns_uri_len) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss", &prefix, &prefix_len, &ns_uri, &ns_uri_len) == FAILURE) { return; } @@ -357,7 +358,8 @@ 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(), getThis(), "Os|O!b", &id, dom_xpath_class_entry, &expr, &expr_len, &context, dom_node_class_entry, ®ister_node_ns) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|O!b", &expr, &expr_len, &context, dom_node_class_entry, ®ister_node_ns) == FAILURE) { return; } diff --git a/ext/xsl/xsltprocessor.c b/ext/xsl/xsltprocessor.c index 0c7ee4117d..43926d25c2 100644 --- a/ext/xsl/xsltprocessor.c +++ b/ext/xsl/xsltprocessor.c @@ -399,7 +399,8 @@ PHP_FUNCTION(xsl_xsltprocessor_import_stylesheet) xmlNode *nodep = NULL; zval *cloneDocu, member, rv; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oo", &id, xsl_xsltprocessor_class_entry, &docp) == FAILURE) { + id = &EX(This); + if (zend_parse_parameters(ZEND_NUM_ARGS(), "o", &docp) == FAILURE) { RETURN_FALSE; } |