diff options
112 files changed, 174 insertions, 176 deletions
diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c index f684a49a54..f42d3363b3 100644 --- a/ext/bcmath/bcmath.c +++ b/ext/bcmath/bcmath.c @@ -106,7 +106,7 @@ const zend_function_entry bcmath_functions[] = { PHP_FE(bcscale, arginfo_bcscale) PHP_FE(bccomp, arginfo_bccomp) PHP_FE(bcpowmod, arginfo_bcpowmod) - {NULL, NULL, NULL} + PHP_FE_END }; zend_module_entry bcmath_module_entry = { diff --git a/ext/bz2/bz2.c b/ext/bz2/bz2.c index 310589fc10..1a8bc41b06 100644 --- a/ext/bz2/bz2.c +++ b/ext/bz2/bz2.c @@ -107,7 +107,7 @@ static const zend_function_entry bz2_functions[] = { PHP_FE(bzerror, arginfo_bzerror) PHP_FE(bzcompress, arginfo_bzcompress) PHP_FE(bzdecompress, arginfo_bzdecompress) - {NULL, NULL, NULL} + PHP_FE_END }; zend_module_entry bz2_module_entry = { diff --git a/ext/calendar/calendar.c b/ext/calendar/calendar.c index 61bf4d10a1..e1546ebf23 100644 --- a/ext/calendar/calendar.c +++ b/ext/calendar/calendar.c @@ -148,7 +148,7 @@ const zend_function_entry calendar_functions[] = { PHP_FE(cal_from_jd, arginfo_cal_from_jd) PHP_FE(cal_days_in_month, arginfo_cal_days_in_month) PHP_FE(cal_info, arginfo_cal_info) - {NULL, NULL, NULL} + PHP_FE_END }; diff --git a/ext/com_dotnet/com_extension.c b/ext/com_dotnet/com_extension.c index 4ded383c05..bf6e536d95 100644 --- a/ext/com_dotnet/com_extension.c +++ b/ext/com_dotnet/com_extension.c @@ -228,7 +228,7 @@ const zend_function_entry com_dotnet_functions[] = { PHP_FE(com_message_pump, arginfo_com_message_pump) PHP_FE(com_load_typelib, arginfo_com_load_typelib) PHP_FE(com_get_active_object, arginfo_com_get_active_object) - { NULL, NULL, NULL } + PHP_FE_END }; /* {{{ com_dotnet_module_entry diff --git a/ext/com_dotnet/com_persist.c b/ext/com_dotnet/com_persist.c index c72bf622a4..edacf21e26 100755 --- a/ext/com_dotnet/com_persist.c +++ b/ext/com_dotnet/com_persist.c @@ -685,7 +685,7 @@ static const zend_function_entry com_persist_helper_methods[] = { CPH_ME(InitNew, NULL) CPH_ME(LoadFromStream, NULL) CPH_ME(SaveToStream, NULL) - {NULL, NULL, NULL} + PHP_FE_END }; static void helper_free_storage(void *obj TSRMLS_DC) diff --git a/ext/ctype/ctype.c b/ext/ctype/ctype.c index 05169619bf..b80e1df6ed 100644 --- a/ext/ctype/ctype.c +++ b/ext/ctype/ctype.c @@ -106,7 +106,7 @@ static const zend_function_entry ctype_functions[] = { PHP_FE(ctype_space, arginfo_ctype_space) PHP_FE(ctype_upper, arginfo_ctype_upper) PHP_FE(ctype_xdigit, arginfo_ctype_xdigit) - {NULL, NULL, NULL} /* Must be the last line in ctype_functions[] */ + PHP_FE_END }; /* }}} */ diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 88502df8bf..ce12171d60 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -305,7 +305,7 @@ const zend_function_entry curl_functions[] = { PHP_FE(curl_multi_getcontent, arginfo_curl_multi_getcontent) PHP_FE(curl_multi_info_read, arginfo_curl_multi_info_read) PHP_FE(curl_multi_close, arginfo_curl_multi_close) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 1930e88abd..24a44b9110 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -425,7 +425,7 @@ const zend_function_entry date_functions[] = { PHP_FE(date_sunrise, arginfo_date_sunrise) PHP_FE(date_sunset, arginfo_date_sunset) PHP_FE(date_sun_info, arginfo_date_sun_info) - {NULL, NULL, NULL} + PHP_FE_END }; const zend_function_entry date_funcs_date[] = { @@ -447,7 +447,7 @@ const zend_function_entry date_funcs_date[] = { PHP_ME_MAPPING(setTimestamp, date_timestamp_set, arginfo_date_method_timestamp_set, 0) PHP_ME_MAPPING(getTimestamp, date_timestamp_get, arginfo_date_method_timestamp_get, 0) PHP_ME_MAPPING(diff, date_diff, arginfo_date_method_diff, 0) - {NULL, NULL, NULL} + PHP_FE_END }; const zend_function_entry date_funcs_timezone[] = { @@ -458,19 +458,19 @@ const zend_function_entry date_funcs_timezone[] = { PHP_ME_MAPPING(getLocation, timezone_location_get, arginfo_timezone_method_location_get, 0) PHP_ME_MAPPING(listAbbreviations, timezone_abbreviations_list, arginfo_timezone_abbreviations_list, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) PHP_ME_MAPPING(listIdentifiers, timezone_identifiers_list, arginfo_timezone_identifiers_list, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) - {NULL, NULL, NULL} + PHP_FE_END }; const zend_function_entry date_funcs_interval[] = { PHP_ME(DateInterval, __construct, arginfo_date_interval_construct, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC) PHP_ME_MAPPING(format, date_interval_format, arginfo_date_method_interval_format, 0) PHP_ME_MAPPING(createFromDateString, date_interval_create_from_date_string, arginfo_date_interval_create_from_date_string, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) - {NULL, NULL, NULL} + PHP_FE_END }; const zend_function_entry date_funcs_period[] = { PHP_ME(DatePeriod, __construct, arginfo_date_period_construct, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; static char* guess_timezone(const timelib_tzdb *tzdb TSRMLS_DC); diff --git a/ext/dba/dba.c b/ext/dba/dba.c index 55fde32459..9b78be4b1e 100644 --- a/ext/dba/dba.c +++ b/ext/dba/dba.c @@ -146,7 +146,7 @@ const zend_function_entry dba_functions[] = { PHP_FE(dba_handlers, arginfo_dba_handlers) PHP_FE(dba_list, arginfo_dba_list) PHP_FE(dba_key_split, arginfo_dba_key_split) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/dom/attr.c b/ext/dom/attr.c index cfa249cacb..63978779f6 100644 --- a/ext/dom/attr.c +++ b/ext/dom/attr.c @@ -49,7 +49,7 @@ ZEND_END_ARG_INFO(); const zend_function_entry php_dom_attr_class_functions[] = { PHP_FALIAS(isId, dom_attr_is_id, arginfo_dom_attr_is_id) PHP_ME(domattr, __construct, arginfo_dom_attr_construct, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; /* {{{ proto void DOMAttr::__construct(string name, [string value]); */ diff --git a/ext/dom/cdatasection.c b/ext/dom/cdatasection.c index a9642c4768..bb133fef87 100644 --- a/ext/dom/cdatasection.c +++ b/ext/dom/cdatasection.c @@ -43,7 +43,7 @@ ZEND_END_ARG_INFO(); const zend_function_entry php_dom_cdatasection_class_functions[] = { PHP_ME(domcdatasection, __construct, arginfo_dom_cdatasection_construct, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; /* {{{ proto void DOMCdataSection::__construct(string value); */ diff --git a/ext/dom/characterdata.c b/ext/dom/characterdata.c index f56c39c8e7..98bb5a0785 100644 --- a/ext/dom/characterdata.c +++ b/ext/dom/characterdata.c @@ -68,7 +68,7 @@ const zend_function_entry php_dom_characterdata_class_functions[] = { PHP_FALIAS(insertData, dom_characterdata_insert_data, arginfo_dom_characterdata_insert_data) PHP_FALIAS(deleteData, dom_characterdata_delete_data, arginfo_dom_characterdata_delete_data) PHP_FALIAS(replaceData, dom_characterdata_replace_data, arginfo_dom_characterdata_replace_data) - {NULL, NULL, NULL} + PHP_FE_END }; /* {{{ data string diff --git a/ext/dom/document.c b/ext/dom/document.c index 2b11e7f1c4..b5402472b7 100644 --- a/ext/dom/document.c +++ b/ext/dom/document.c @@ -231,7 +231,7 @@ const zend_function_entry php_dom_document_class_functions[] = { /* {{{ */ PHP_FALIAS(relaxNGValidateSource, dom_document_relaxNG_validate_xml, arginfo_dom_document_relaxNG_validate_xml) #endif PHP_ME(domdocument, registerNodeClass, arginfo_dom_document_registernodeclass, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/dom/documentfragment.c b/ext/dom/documentfragment.c index 2e88b726de..da01cd9aa6 100644 --- a/ext/dom/documentfragment.c +++ b/ext/dom/documentfragment.c @@ -46,7 +46,7 @@ ZEND_END_ARG_INFO(); const zend_function_entry php_dom_documentfragment_class_functions[] = { PHP_ME(domdocumentfragment, __construct, arginfo_dom_documentfragement_construct, ZEND_ACC_PUBLIC) PHP_ME(domdocumentfragment, appendXML, arginfo_dom_documentfragement_appendXML, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; /* {{{ proto void DOMDocumentFragment::__construct(); */ diff --git a/ext/dom/documenttype.c b/ext/dom/documenttype.c index a83c7eac17..69b21c3c82 100644 --- a/ext/dom/documenttype.c +++ b/ext/dom/documenttype.c @@ -35,7 +35,7 @@ */ const zend_function_entry php_dom_documenttype_class_functions[] = { - {NULL, NULL, NULL} + PHP_FE_END }; /* {{{ name string diff --git a/ext/dom/domconfiguration.c b/ext/dom/domconfiguration.c index 1ad57fe65e..76f18da046 100644 --- a/ext/dom/domconfiguration.c +++ b/ext/dom/domconfiguration.c @@ -54,7 +54,7 @@ const zend_function_entry php_dom_domconfiguration_class_functions[] = { PHP_FALIAS(setParameter, dom_domconfiguration_set_parameter, arginfo_dom_configuration_set_parameter) PHP_FALIAS(getParameter, dom_domconfiguration_get_parameter, arginfo_dom_configuration_get_parameter) PHP_FALIAS(canSetParameter, dom_domconfiguration_can_set_parameter, arginfo_dom_configuration_can_set_parameter) - {NULL, NULL, NULL} + PHP_FE_END }; /* {{{ attribute protos, not implemented yet */ diff --git a/ext/dom/domerror.c b/ext/dom/domerror.c index 414defe484..0f5f3f7d90 100644 --- a/ext/dom/domerror.c +++ b/ext/dom/domerror.c @@ -36,7 +36,7 @@ */ const zend_function_entry php_dom_domerror_class_functions[] = { - {NULL, NULL, NULL} + PHP_FE_END }; /* {{{ attribute protos, not implemented yet */ diff --git a/ext/dom/domerrorhandler.c b/ext/dom/domerrorhandler.c index 4df9e35161..9fcc4e9eaa 100644 --- a/ext/dom/domerrorhandler.c +++ b/ext/dom/domerrorhandler.c @@ -42,7 +42,7 @@ ZEND_END_ARG_INFO(); const zend_function_entry php_dom_domerrorhandler_class_functions[] = { PHP_FALIAS(handleError, dom_domerrorhandler_handle_error, arginfo_dom_domerrorhandler_handle_error) - {NULL, NULL, NULL} + PHP_FE_END }; /* {{{ attribute protos, not implemented yet */ diff --git a/ext/dom/domexception.c b/ext/dom/domexception.c index 8046873bb0..5477e34ef3 100644 --- a/ext/dom/domexception.c +++ b/ext/dom/domexception.c @@ -37,7 +37,7 @@ extern zend_class_entry *dom_domexception_class_entry; const zend_function_entry php_dom_domexception_class_functions[] = { - {NULL, NULL, NULL} + PHP_FE_END }; void php_dom_throw_error_with_message(int error_code, char *error_message, int strict_error TSRMLS_DC) /* {{{ */ diff --git a/ext/dom/domimplementation.c b/ext/dom/domimplementation.c index c931dc5ede..c7ad1d7bb7 100644 --- a/ext/dom/domimplementation.c +++ b/ext/dom/domimplementation.c @@ -61,7 +61,7 @@ const zend_function_entry php_dom_domimplementation_class_functions[] = { PHP_ME(domimplementation, hasFeature, arginfo_dom_implementation_has_feature, ZEND_ACC_PUBLIC|ZEND_ACC_ALLOW_STATIC) PHP_ME(domimplementation, createDocumentType, arginfo_dom_implementation_create_documenttype, ZEND_ACC_PUBLIC|ZEND_ACC_ALLOW_STATIC) PHP_ME(domimplementation, createDocument, arginfo_dom_implementation_create_document, ZEND_ACC_PUBLIC|ZEND_ACC_ALLOW_STATIC) - {NULL, NULL, NULL} + PHP_FE_END }; /* {{{ proto boolean dom_domimplementation_has_feature(string feature, string version); diff --git a/ext/dom/domimplementationsource.c b/ext/dom/domimplementationsource.c index 0fc33a2ed7..e7638834c6 100644 --- a/ext/dom/domimplementationsource.c +++ b/ext/dom/domimplementationsource.c @@ -48,7 +48,7 @@ ZEND_END_ARG_INFO(); const zend_function_entry php_dom_domimplementationsource_class_functions[] = { PHP_FALIAS(getDomimplementation, dom_domimplementationsource_get_domimplementation, arginfo_dom_implementationsource_getdomimplementation) PHP_FALIAS(getDomimplementations, dom_domimplementationsource_get_domimplementations, arginfo_dom_implementationsource_getdomimplementations) - {NULL, NULL, NULL} + PHP_FE_END }; /* {{{ attribute protos, not implemented yet */ diff --git a/ext/dom/domlocator.c b/ext/dom/domlocator.c index b31a4564a9..f2c92bebdf 100644 --- a/ext/dom/domlocator.c +++ b/ext/dom/domlocator.c @@ -36,7 +36,7 @@ */ const zend_function_entry php_dom_domlocator_class_functions[] = { - {NULL, NULL, NULL} + PHP_FE_END }; /* {{{ attribute protos, not implemented yet */ diff --git a/ext/dom/domstringlist.c b/ext/dom/domstringlist.c index 0791ec8d8e..f00d5ff44e 100644 --- a/ext/dom/domstringlist.c +++ b/ext/dom/domstringlist.c @@ -42,7 +42,7 @@ ZEND_END_ARG_INFO(); const zend_function_entry php_dom_domstringlist_class_functions[] = { PHP_FALIAS(item, dom_domstringlist_item, arginfo_dom_stringlist_item) - {NULL, NULL, NULL} + PHP_FE_END }; /* {{{ attribute protos, not implemented yet */ diff --git a/ext/dom/element.c b/ext/dom/element.c index 5a7d007e23..66ad2af163 100644 --- a/ext/dom/element.c +++ b/ext/dom/element.c @@ -146,7 +146,7 @@ const zend_function_entry php_dom_element_class_functions[] = { /* {{{ */ PHP_FALIAS(setIdAttributeNS, dom_element_set_id_attribute_ns, arginfo_dom_element_set_id_attribute_ns) PHP_FALIAS(setIdAttributeNode, dom_element_set_id_attribute_node, arginfo_dom_element_set_id_attribute_node) PHP_ME(domelement, __construct, arginfo_dom_element_construct, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/dom/entity.c b/ext/dom/entity.c index 71eeacf924..5b7151e5b3 100644 --- a/ext/dom/entity.c +++ b/ext/dom/entity.c @@ -36,7 +36,7 @@ */ const zend_function_entry php_dom_entity_class_functions[] = { - {NULL, NULL, NULL} + PHP_FE_END }; /* {{{ publicId string diff --git a/ext/dom/entityreference.c b/ext/dom/entityreference.c index b9404ba1cd..daabf41ea5 100644 --- a/ext/dom/entityreference.c +++ b/ext/dom/entityreference.c @@ -42,7 +42,7 @@ ZEND_END_ARG_INFO(); const zend_function_entry php_dom_entityreference_class_functions[] = { PHP_ME(domentityreference, __construct, arginfo_dom_entityreference_construct, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; /* {{{ proto void DOMEntityReference::__construct(string name); */ diff --git a/ext/dom/namednodemap.c b/ext/dom/namednodemap.c index d259963e2f..963371a8e5 100644 --- a/ext/dom/namednodemap.c +++ b/ext/dom/namednodemap.c @@ -74,7 +74,7 @@ const zend_function_entry php_dom_namednodemap_class_functions[] = { /* {{{ */ PHP_FALIAS(getNamedItemNS, dom_namednodemap_get_named_item_ns, arginfo_dom_namednodemap_get_named_item_ns) PHP_FALIAS(setNamedItemNS, dom_namednodemap_set_named_item_ns, arginfo_dom_namednodemap_set_named_item_ns) PHP_FALIAS(removeNamedItemNS, dom_namednodemap_remove_named_item_ns, arginfo_dom_namednodemap_remove_named_item_ns) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/dom/namelist.c b/ext/dom/namelist.c index 2d2bc69ee6..fb454a783a 100644 --- a/ext/dom/namelist.c +++ b/ext/dom/namelist.c @@ -47,7 +47,7 @@ ZEND_END_ARG_INFO(); const zend_function_entry php_dom_namelist_class_functions[] = { PHP_FALIAS(getName, dom_namelist_get_name, arginfo_dom_namelist_get_name) PHP_FALIAS(getNamespaceURI, dom_namelist_get_namespace_uri, arginfo_dom_namelist_get_namespace_uri) - {NULL, NULL, NULL} + PHP_FE_END }; /* {{{ length int diff --git a/ext/dom/node.c b/ext/dom/node.c index 17040521e1..839c797bb6 100644 --- a/ext/dom/node.c +++ b/ext/dom/node.c @@ -155,7 +155,7 @@ const zend_function_entry php_dom_node_class_functions[] = { /* {{{ */ PHP_ME(domnode, getLineNo, arginfo_dom_node_getLineNo, ZEND_ACC_PUBLIC) PHP_ME(domnode, C14N, arginfo_dom_node_C14N, ZEND_ACC_PUBLIC) PHP_ME(domnode, C14NFile, arginfo_dom_node_C14NFile, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/dom/nodelist.c b/ext/dom/nodelist.c index 2baeea29d9..f7d7d15450 100644 --- a/ext/dom/nodelist.c +++ b/ext/dom/nodelist.c @@ -43,7 +43,7 @@ ZEND_END_ARG_INFO(); const zend_function_entry php_dom_nodelist_class_functions[] = { PHP_FALIAS(item, dom_nodelist_item, arginfo_dom_nodelist_item) - {NULL, NULL, NULL} + PHP_FE_END }; /* {{{ length int diff --git a/ext/dom/notation.c b/ext/dom/notation.c index d1b93eb8db..bb3c12f28f 100644 --- a/ext/dom/notation.c +++ b/ext/dom/notation.c @@ -35,7 +35,7 @@ */ const zend_function_entry php_dom_notation_class_functions[] = { - {NULL, NULL, NULL} + PHP_FE_END }; /* {{{ attribute protos, not implemented yet */ diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c index 69f13023a5..d92e9449de 100644 --- a/ext/dom/php_dom.c +++ b/ext/dom/php_dom.c @@ -543,7 +543,7 @@ ZEND_END_ARG_INFO() static const zend_function_entry dom_functions[] = { PHP_FE(dom_import_simplexml, arginfo_dom_import_simplexml) - {NULL, NULL, NULL} + PHP_FE_END }; static zend_object_handlers* dom_get_obj_handlers(TSRMLS_D) { diff --git a/ext/dom/processinginstruction.c b/ext/dom/processinginstruction.c index 88ddb3692b..ac59518c59 100644 --- a/ext/dom/processinginstruction.c +++ b/ext/dom/processinginstruction.c @@ -44,7 +44,7 @@ ZEND_END_ARG_INFO(); const zend_function_entry php_dom_processinginstruction_class_functions[] = { PHP_ME(domprocessinginstruction, __construct, arginfo_dom_processinginstruction_construct, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; /* {{{ proto void DOMProcessingInstruction::__construct(string name, [string value]); */ diff --git a/ext/dom/string_extend.c b/ext/dom/string_extend.c index 1cdc261f33..f2b4623dd3 100644 --- a/ext/dom/string_extend.c +++ b/ext/dom/string_extend.c @@ -47,7 +47,7 @@ ZEND_END_ARG_INFO(); const zend_function_entry php_dom_string_extend_class_functions[] = { PHP_FALIAS(findOffset16, dom_string_extend_find_offset16, arginfo_dom_string_extend_find_offset16) PHP_FALIAS(findOffset32, dom_string_extend_find_offset32, arginfo_dom_string_extend_find_offset32) - {NULL, NULL, NULL} + PHP_FE_END }; /* {{{ attribute protos, not implemented yet */ diff --git a/ext/dom/text.c b/ext/dom/text.c index d0e599b8f4..b418345cb0 100644 --- a/ext/dom/text.c +++ b/ext/dom/text.c @@ -58,7 +58,7 @@ const zend_function_entry php_dom_text_class_functions[] = { PHP_FALIAS(isElementContentWhitespace, dom_text_is_whitespace_in_element_content, arginfo_dom_text_is_whitespace_in_element_content) PHP_FALIAS(replaceWholeText, dom_text_replace_whole_text, arginfo_dom_text_replace_whole_text) PHP_ME(domtext, __construct, arginfo_dom_text_construct, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; /* {{{ proto void DOMText::__construct([string value]); */ diff --git a/ext/dom/typeinfo.c b/ext/dom/typeinfo.c index 275d9d71af..43dc4d1971 100644 --- a/ext/dom/typeinfo.c +++ b/ext/dom/typeinfo.c @@ -36,7 +36,7 @@ */ const zend_function_entry php_dom_typeinfo_class_functions[] = { - {NULL, NULL, NULL} + PHP_FE_END }; /* {{{ attribute protos, not implemented yet */ diff --git a/ext/dom/userdatahandler.c b/ext/dom/userdatahandler.c index 4d6aa1eea5..08f11620f7 100644 --- a/ext/dom/userdatahandler.c +++ b/ext/dom/userdatahandler.c @@ -37,7 +37,7 @@ const zend_function_entry php_dom_userdatahandler_class_functions[] = { PHP_FALIAS(handle, dom_userdatahandler_handle, NULL) - {NULL, NULL, NULL} + PHP_FE_END }; /* {{{ attribute protos, not implemented yet */ diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c index 4999770667..ba2b972518 100644 --- a/ext/dom/xpath.c +++ b/ext/dom/xpath.c @@ -68,7 +68,7 @@ const zend_function_entry php_dom_xpath_class_functions[] = { PHP_FALIAS(query, dom_xpath_query, arginfo_dom_xpath_query) PHP_FALIAS(evaluate, dom_xpath_evaluate, arginfo_dom_xpath_evaluate) PHP_FALIAS(registerPhpFunctions, dom_xpath_register_php_functions, arginfo_dom_xpath_register_php_functions) - {NULL, NULL, NULL} + PHP_FE_END }; diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c index 81404db53a..8bbea75f84 100755 --- a/ext/enchant/enchant.c +++ b/ext/enchant/enchant.c @@ -146,8 +146,7 @@ zend_function_entry enchant_functions[] = { PHP_FE(enchant_dict_get_error, arginfo_enchant_broker_free_dict) PHP_FE(enchant_dict_describe, arginfo_enchant_broker_free_dict) PHP_FE(enchant_dict_quick_check, arginfo_enchant_dict_quick_check) - - {NULL, NULL, NULL} /* Must be the last line in enchant_functions[] */ + PHP_FE_END }; /* }}} */ diff --git a/ext/ereg/ereg.c b/ext/ereg/ereg.c index 1600e46bab..3fbaa2cc63 100644 --- a/ext/ereg/ereg.c +++ b/ext/ereg/ereg.c @@ -59,7 +59,7 @@ const zend_function_entry ereg_functions[] = { PHP_DEP_FE(split, arginfo_split) PHP_DEP_FE(spliti, arginfo_split) PHP_DEP_FE(sql_regcase, arginfo_sql_regcase) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 48af4d64dd..d7d19eff8e 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -134,7 +134,7 @@ const zend_function_entry exif_functions[] = { PHP_FE(exif_tagname, arginfo_exif_tagname) PHP_FE(exif_thumbnail, arginfo_exif_thumbnail) PHP_FE(exif_imagetype, arginfo_exif_imagetype) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c index 613c043771..3376c5d69b 100644 --- a/ext/fileinfo/fileinfo.c +++ b/ext/fileinfo/fileinfo.c @@ -171,7 +171,7 @@ zend_function_entry finfo_class_functions[] = { ZEND_ME_MAPPING(set_flags, finfo_set_flags,arginfo_finfo_method_set_flags, ZEND_ACC_PUBLIC) ZEND_ME_MAPPING(file, finfo_file, arginfo_finfo_method_file, ZEND_ACC_PUBLIC) ZEND_ME_MAPPING(buffer, finfo_buffer, arginfo_finfo_method_buffer, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/filter/filter.c b/ext/filter/filter.c index 6e61719060..ebbe0991e9 100644 --- a/ext/filter/filter.c +++ b/ext/filter/filter.c @@ -128,7 +128,7 @@ static const zend_function_entry filter_functions[] = { PHP_FE(filter_list, arginfo_filter_list) PHP_FE(filter_has_var, arginfo_filter_has_var) PHP_FE(filter_id, arginfo_filter_id) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c index 6c44733fed..ec3f7c7049 100644 --- a/ext/ftp/php_ftp.c +++ b/ext/ftp/php_ftp.c @@ -278,7 +278,7 @@ const zend_function_entry php_ftp_functions[] = { PHP_FE(ftp_nb_put, arginfo_ftp_nb_put) PHP_FE(ftp_nb_fput, arginfo_ftp_nb_fput) PHP_FALIAS(ftp_quit, ftp_close, arginfo_ftp_close) - {NULL, NULL, NULL} + PHP_FE_END }; zend_module_entry php_ftp_module_entry = { diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 1fe321773c..ed42395c42 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -1065,7 +1065,7 @@ const zend_function_entry gd_functions[] = { PHP_FE(imagefilter, arginfo_imagefilter) PHP_FE(imageconvolution, arginfo_imageconvolution) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/gettext/gettext.c b/ext/gettext/gettext.c index dbdeebd961..0daa643d7d 100644 --- a/ext/gettext/gettext.c +++ b/ext/gettext/gettext.c @@ -112,7 +112,7 @@ const zend_function_entry php_gettext_functions[] = { #if HAVE_BIND_TEXTDOMAIN_CODESET PHP_NAMED_FE(bind_textdomain_codeset, zif_bind_textdomain_codeset, arginfo_bind_textdomain_codeset) #endif - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c index 039eb46b44..5f04ef9aa5 100644 --- a/ext/gmp/gmp.c +++ b/ext/gmp/gmp.c @@ -280,7 +280,7 @@ const zend_function_entry gmp_functions[] = { ZEND_FE(gmp_popcount, arginfo_gmp_popcount) ZEND_FE(gmp_hamdist, arginfo_gmp_hamdist) ZEND_FE(gmp_nextprime, arginfo_gmp_nextprime) - {NULL, NULL, NULL} /* Must be the last line in gmp_functions[] */ + PHP_FE_END }; /* }}} */ diff --git a/ext/hash/hash.c b/ext/hash/hash.c index 1c2d4241c4..2a9e54c8bc 100644 --- a/ext/hash/hash.c +++ b/ext/hash/hash.c @@ -1071,7 +1071,7 @@ const zend_function_entry hash_functions[] = { PHP_FE(mhash, arginfo_mhash) #endif - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index a03977b4bd..58e7531423 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -136,7 +136,7 @@ const zend_function_entry iconv_functions[] = { PHP_FE(iconv_mime_encode, arginfo_iconv_mime_encode) PHP_FE(iconv_mime_decode, arginfo_iconv_mime_decode) PHP_FE(iconv_mime_decode_headers, arginfo_iconv_mime_decode_headers) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index 34fae16763..9c0ed32dd9 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -551,7 +551,7 @@ const zend_function_entry imap_functions[] = { PHP_FALIAS(imap_scan, imap_listscan, arginfo_imap_listscan) PHP_FALIAS(imap_create, imap_createmailbox, arginfo_imap_createmailbox) PHP_FALIAS(imap_rename, imap_renamemailbox, arginfo_imap_renamemailbox) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c index bc50175a23..1e1440cbd3 100644 --- a/ext/interbase/interbase.c +++ b/ext/interbase/interbase.c @@ -441,7 +441,7 @@ const zend_function_entry ibase_functions[] = { PHP_FALIAS(fbird_wait_event, ibase_wait_event, arginfo_ibase_wait_event) PHP_FALIAS(fbird_set_event_handler, ibase_set_event_handler, arginfo_ibase_set_event_handler) PHP_FALIAS(fbird_free_event_handler, ibase_free_event_handler, arginfo_ibase_free_event_handler) - {NULL, NULL, NULL} + PHP_FE_END }; zend_module_entry ibase_module_entry = { diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c index 25d93980ef..de5226b3d8 100755 --- a/ext/intl/php_intl.c +++ b/ext/intl/php_intl.c @@ -534,7 +534,7 @@ zend_function_entry intl_functions[] = { PHP_FE( intl_is_failure, intl_1_arg ) PHP_FE( intl_error_name, intl_1_arg ) - { NULL, NULL, NULL } + PHP_FE_END }; /* }}} */ diff --git a/ext/json/json.c b/ext/json/json.c index 7231e647c3..fd8af799c8 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -64,7 +64,7 @@ static const zend_function_entry json_functions[] = { PHP_FE(json_encode, arginfo_json_encode) PHP_FE(json_decode, arginfo_json_decode) PHP_FE(json_last_error, arginfo_json_last_error) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index 790ef6bf54..04caa86da7 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -2712,7 +2712,7 @@ const zend_function_entry ldap_functions[] = { PHP_FE(ldap_control_paged_result, arginfo_ldap_control_paged_result) PHP_FE(ldap_control_paged_result_response, arginfo_ldap_control_paged_result_response) #endif - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c index 9518e13cc0..25988a6d60 100644 --- a/ext/libxml/libxml.c +++ b/ext/libxml/libxml.c @@ -121,7 +121,7 @@ static const zend_function_entry libxml_functions[] = { PHP_FE(libxml_clear_errors, arginfo_libxml_clear_errors) PHP_FE(libxml_get_errors, arginfo_libxml_get_errors) PHP_FE(libxml_disable_entity_loader, arginfo_libxml_disable_entity_loader) - {NULL, NULL, NULL} + PHP_FE_END }; zend_module_entry libxml_module_entry = { diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index f87b51abf7..1600f97252 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -559,7 +559,7 @@ const zend_function_entry mbstring_functions[] = { #if HAVE_MBREGEX PHP_MBREGEX_FUNCTION_ENTRIES #endif - { NULL, NULL, NULL } + PHP_FE_END }; /* }}} */ diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c index 7fecc1cca0..9167ab2d1d 100644 --- a/ext/mcrypt/mcrypt.c +++ b/ext/mcrypt/mcrypt.c @@ -280,7 +280,7 @@ const zend_function_entry mcrypt_functions[] = { /* {{{ */ PHP_FE(mcrypt_module_get_supported_key_sizes, arginfo_mcrypt_module_get_supported_key_sizes) PHP_FE(mcrypt_module_close, arginfo_mcrypt_module_close) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index f3af40bc2b..5a86256413 100644 --- a/ext/mssql/php_mssql.c +++ b/ext/mssql/php_mssql.c @@ -178,7 +178,7 @@ const zend_function_entry mssql_functions[] = { PHP_FE(mssql_execute, arginfo_mssql_execute) PHP_FE(mssql_free_statement, arginfo_mssql_free_statement) PHP_FE(mssql_guid_string, arginfo_mssql_guid_string) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index cfce37d5d5..78972c95c1 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -320,7 +320,7 @@ static const zend_function_entry mysql_functions[] = { PHP_FALIAS(mysql_dbname, mysql_result, arginfo_mysql_result) PHP_FALIAS(mysql_tablename, mysql_result, arginfo_mysql_result) PHP_FALIAS(mysql_table_name, mysql_result, arginfo_mysql_result) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/mysqli/mysqli_fe.c b/ext/mysqli/mysqli_fe.c index 6d80c5507c..eb133b1a80 100644 --- a/ext/mysqli/mysqli_fe.c +++ b/ext/mysqli/mysqli_fe.c @@ -460,7 +460,7 @@ const zend_function_entry mysqli_functions[] = { PHP_FALIAS(mysqli_escape_string, mysqli_real_escape_string, arginfo_mysqli_query) PHP_FALIAS(mysqli_set_opt, mysqli_options, NULL) - {NULL, NULL, NULL} /* Must be the last line in mysqli_functions[] */ + PHP_FE_END }; /* }}} */ diff --git a/ext/mysqlnd/php_mysqlnd.c b/ext/mysqlnd/php_mysqlnd.c index c02ae58b4e..1c744cea68 100644 --- a/ext/mysqlnd/php_mysqlnd.c +++ b/ext/mysqlnd/php_mysqlnd.c @@ -33,7 +33,7 @@ * Every user visible function must have an entry in mysqlnd_functions[]. */ static zend_function_entry mysqlnd_functions[] = { - {NULL, NULL, NULL} /* Must be the last line in mysqlnd_functions[] */ + PHP_FE_END }; /* }}} */ diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index 13713d10ea..9417dec0d9 100644 --- a/ext/oci8/oci8.c +++ b/ext/oci8/oci8.c @@ -937,7 +937,7 @@ zend_function_entry php_oci_functions[] = { PHP_FALIAS(ocicollsize, oci_collection_size, arginfo_oci_collection_size) PHP_FALIAS(ocicollmax, oci_collection_max, arginfo_oci_collection_max) PHP_FALIAS(ocicolltrim, oci_collection_trim, arginfo_oci_collection_trim) - {NULL,NULL,NULL} + PHP_FE_END }; static @@ -968,7 +968,7 @@ zend_function_entry php_oci_lob_class_functions[] = { PHP_FALIAS(save, oci_lob_save, arginfo_oci_lob_save_method) PHP_FALIAS(savefile, oci_lob_import, arginfo_oci_lob_import_method) PHP_FALIAS(free, oci_free_descriptor, arginfo_oci_free_descriptor_method) - {NULL,NULL,NULL} + PHP_FE_END }; static @@ -985,7 +985,7 @@ zend_function_entry php_oci_coll_class_functions[] = { PHP_FALIAS(max, oci_collection_max, arginfo_oci_collection_max_method) PHP_FALIAS(trim, oci_collection_trim, arginfo_oci_collection_trim_method) PHP_FALIAS(free, oci_free_collection, arginfo_oci_collection_free_method) - {NULL,NULL,NULL} + PHP_FE_END }; zend_module_entry oci8_module_entry = { diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index 5275a35b45..52e8f57a04 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -383,7 +383,7 @@ const zend_function_entry odbc_functions[] = { #endif PHP_FALIAS(odbc_do, odbc_exec, arginfo_odbc_exec) PHP_FALIAS(odbc_field_precision, odbc_field_len, arginfo_odbc_field_len) - { NULL, NULL, NULL } + PHP_FE_END }; /* }}} */ diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index b41d04c3bb..89e049d78b 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -446,7 +446,7 @@ const zend_function_entry openssl_functions[] = { PHP_FE(openssl_random_pseudo_bytes, arginfo_openssl_random_pseudo_bytes) PHP_FE(openssl_error_string, arginfo_openssl_error_string) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c index 866106c44a..b90b246deb 100755 --- a/ext/pcntl/pcntl.c +++ b/ext/pcntl/pcntl.c @@ -172,7 +172,7 @@ const zend_function_entry pcntl_functions[] = { PHP_FE(pcntl_sigwaitinfo, arginfo_pcntl_sigwaitinfo) PHP_FE(pcntl_sigtimedwait, arginfo_pcntl_sigtimedwait) #endif - {NULL, NULL, NULL} + PHP_FE_END }; zend_module_entry pcntl_module_entry = { diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 5e1a75394f..27bea79922 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -1894,7 +1894,7 @@ static const zend_function_entry pcre_functions[] = { PHP_FE(preg_quote, arginfo_preg_quote) PHP_FE(preg_grep, arginfo_preg_grep) PHP_FE(preg_last_error, arginfo_preg_last_error) - {NULL, NULL, NULL} + PHP_FE_END }; zend_module_entry pcre_module_entry = { diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c index f83d304dec..1604d51858 100755 --- a/ext/pdo/pdo.c +++ b/ext/pdo/pdo.c @@ -125,7 +125,7 @@ ZEND_END_ARG_INFO() /* {{{ pdo_functions[] */ const zend_function_entry pdo_functions[] = { PHP_FE(pdo_drivers, arginfo_pdo_drivers) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/pdo_dblib/pdo_dblib.c b/ext/pdo_dblib/pdo_dblib.c index 531a569ecc..278c1985a1 100644 --- a/ext/pdo_dblib/pdo_dblib.c +++ b/ext/pdo_dblib/pdo_dblib.c @@ -36,7 +36,7 @@ ZEND_DECLARE_MODULE_GLOBALS(dblib) static PHP_GINIT_FUNCTION(dblib); const zend_function_entry pdo_dblib_functions[] = { - {NULL, NULL, NULL} + PHP_FE_END }; #if ZEND_MODULE_API_NO >= 20050922 diff --git a/ext/pdo_firebird/pdo_firebird.c b/ext/pdo_firebird/pdo_firebird.c index a732ff9960..6459c70364 100644 --- a/ext/pdo_firebird/pdo_firebird.c +++ b/ext/pdo_firebird/pdo_firebird.c @@ -31,7 +31,7 @@ #include "php_pdo_firebird_int.h" const zend_function_entry pdo_firebird_functions[] = { /* {{{ */ - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/pdo_mysql/pdo_mysql.c b/ext/pdo_mysql/pdo_mysql.c index 831676fcd2..5fdab6ba94 100755 --- a/ext/pdo_mysql/pdo_mysql.c +++ b/ext/pdo_mysql/pdo_mysql.c @@ -170,7 +170,7 @@ static PHP_GINIT_FUNCTION(pdo_mysql) /* {{{ pdo_mysql_functions[] */ const zend_function_entry pdo_mysql_functions[] = { - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/pdo_oci/pdo_oci.c b/ext/pdo_oci/pdo_oci.c index 2fbfc31846..78539761b7 100755 --- a/ext/pdo_oci/pdo_oci.c +++ b/ext/pdo_oci/pdo_oci.c @@ -32,7 +32,7 @@ /* {{{ pdo_oci_functions[] */ const zend_function_entry pdo_oci_functions[] = { - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/pdo_odbc/pdo_odbc.c b/ext/pdo_odbc/pdo_odbc.c index 7611cd485b..69ac263ac7 100755 --- a/ext/pdo_odbc/pdo_odbc.c +++ b/ext/pdo_odbc/pdo_odbc.c @@ -32,7 +32,7 @@ /* {{{ pdo_odbc_functions[] */ const zend_function_entry pdo_odbc_functions[] = { - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c index 5d3c081680..aa6df34a2e 100644 --- a/ext/pdo_pgsql/pgsql_driver.c +++ b/ext/pdo_pgsql/pgsql_driver.c @@ -984,7 +984,7 @@ static const zend_function_entry dbh_methods[] = { PHP_ME(PDO, pgsqlCopyFromFile, NULL, ZEND_ACC_PUBLIC) PHP_ME(PDO, pgsqlCopyToArray, NULL, ZEND_ACC_PUBLIC) PHP_ME(PDO, pgsqlCopyToFile, NULL, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; static const zend_function_entry *pdo_pgsql_get_driver_methods(pdo_dbh_t *dbh, int kind TSRMLS_DC) diff --git a/ext/pdo_sqlite/pdo_sqlite.c b/ext/pdo_sqlite/pdo_sqlite.c index 053ae3bddf..c9a514a41b 100644 --- a/ext/pdo_sqlite/pdo_sqlite.c +++ b/ext/pdo_sqlite/pdo_sqlite.c @@ -35,7 +35,7 @@ /* {{{ pdo_sqlite_functions[] */ const zend_function_entry pdo_sqlite_functions[] = { - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/pdo_sqlite/sqlite_driver.c b/ext/pdo_sqlite/sqlite_driver.c index 0bd77b3c84..71768a31b1 100644 --- a/ext/pdo_sqlite/sqlite_driver.c +++ b/ext/pdo_sqlite/sqlite_driver.c @@ -593,7 +593,7 @@ static PHP_METHOD(SQLite, sqliteCreateAggregate) static const zend_function_entry dbh_methods[] = { PHP_ME(SQLite, sqliteCreateFunction, NULL, ZEND_ACC_PUBLIC) PHP_ME(SQLite, sqliteCreateAggregate, NULL, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; static const zend_function_entry *get_driver_methods(pdo_dbh_t *dbh, int kind TSRMLS_DC) diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index c2dd8b4a27..a82271776c 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -697,7 +697,7 @@ const zend_function_entry pgsql_functions[] = { PHP_FALIAS(pg_clientencoding, pg_client_encoding, arginfo_pg_client_encoding) PHP_FALIAS(pg_setclientencoding, pg_set_client_encoding, arginfo_pg_set_client_encoding) #endif - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/phar/phar.c b/ext/phar/phar.c index bf432ac2c2..c31fd7d070 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -3291,7 +3291,7 @@ ZEND_GET_MODULE(phar) * Every user visible function must have an entry in phar_functions[]. */ zend_function_entry phar_functions[] = { - {NULL, NULL, NULL} /* Must be the last line in phar_functions[] */ + PHP_FE_END }; /* }}}*/ diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 176d660a1c..38ef95fbd1 100644 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -5488,7 +5488,7 @@ zend_function_entry php_archive_methods[] = { PHP_ME(Phar, mungServer, arginfo_phar_mungServer, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL) PHP_ME(Phar, unlinkArchive, arginfo_phar_ua, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL) PHP_ME(Phar, webPhar, arginfo_phar_webPhar, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL) - {NULL, NULL, NULL} + PHP_FE_END }; #if HAVE_SPL @@ -5518,12 +5518,12 @@ zend_function_entry php_entry_methods[] = { PHP_ME(PharFileInfo, isCompressed, arginfo_phar_compo, ZEND_ACC_PUBLIC) PHP_ME(PharFileInfo, isCRCChecked, arginfo_phar__void, ZEND_ACC_PUBLIC) PHP_ME(PharFileInfo, setMetadata, arginfo_phar_setMetadata, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; #endif /* HAVE_SPL */ zend_function_entry phar_exception_methods[] = { - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/posix/posix.c b/ext/posix/posix.c index 580911afa6..be2a4f53ce 100644 --- a/ext/posix/posix.c +++ b/ext/posix/posix.c @@ -301,7 +301,7 @@ const zend_function_entry posix_functions[] = { PHP_FE(posix_initgroups, arginfo_posix_initgroups) #endif - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/pspell/pspell.c b/ext/pspell/pspell.c index abdded3fd2..7e56d77a6b 100644 --- a/ext/pspell/pspell.c +++ b/ext/pspell/pspell.c @@ -198,7 +198,7 @@ static const zend_function_entry pspell_functions[] = { PHP_FE(pspell_config_data_dir, arginfo_pspell_config_data_dir) PHP_FE(pspell_config_repl, arginfo_pspell_config_repl) PHP_FE(pspell_config_save_repl, arginfo_pspell_config_save_repl) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/readline/readline.c b/ext/readline/readline.c index d199cdf517..a5d0f7d2ba 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -146,7 +146,7 @@ static const zend_function_entry php_readline_functions[] = { PHP_FE(readline_redisplay, arginfo_readline_redisplay) PHP_FE(readline_on_new_line, arginfo_readline_on_new_line) #endif - {NULL, NULL, NULL} + PHP_FE_END }; zend_module_entry readline_module_entry = { diff --git a/ext/recode/recode.c b/ext/recode/recode.c index 747df23b95..5b82b3fd62 100644 --- a/ext/recode/recode.c +++ b/ext/recode/recode.c @@ -84,7 +84,7 @@ static const zend_function_entry php_recode_functions[] = { PHP_FE(recode_string, arginfo_recode_string) PHP_FE(recode_file, arginfo_recode_file) PHP_FALIAS(recode, recode_string, arginfo_recode_string) - {NULL, NULL, NULL} + PHP_FE_END }; zend_module_entry recode_module_entry = { diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 850192e84c..9f770360d3 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -5485,7 +5485,7 @@ ZEND_METHOD(reflection_zend_extension, getCopyright) /* {{{ method tables */ static const zend_function_entry reflection_exception_functions[] = { - {NULL, NULL, NULL} + PHP_FE_END }; ZEND_BEGIN_ARG_INFO(arginfo_reflection__void, 0) @@ -5504,13 +5504,13 @@ ZEND_END_ARG_INFO() static const zend_function_entry reflection_functions[] = { ZEND_ME(reflection, getModifierNames, arginfo_reflection_getModifierNames, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) ZEND_ME(reflection, export, arginfo_reflection_export, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) - {NULL, NULL, NULL} + PHP_FE_END }; static const zend_function_entry reflector_functions[] = { ZEND_FENTRY(export, NULL, NULL, ZEND_ACC_STATIC|ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC) ZEND_ABSTRACT_ME(reflector, __toString, arginfo_reflection__void) - {NULL, NULL, NULL} + PHP_FE_END }; ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_function_export, 0, 0, 1) @@ -5553,7 +5553,7 @@ static const zend_function_entry reflection_function_abstract_functions[] = { ZEND_ME(reflection_function, getStartLine, arginfo_reflection__void, 0) ZEND_ME(reflection_function, getStaticVariables, arginfo_reflection__void, 0) ZEND_ME(reflection_function, returnsReference, arginfo_reflection__void, 0) - {NULL, NULL, NULL} + PHP_FE_END }; static const zend_function_entry reflection_function_functions[] = { @@ -5564,7 +5564,7 @@ static const zend_function_entry reflection_function_functions[] = { ZEND_ME(reflection_function, invoke, arginfo_reflection_function_invoke, 0) ZEND_ME(reflection_function, invokeArgs, arginfo_reflection_function_invokeArgs, 0) ZEND_ME(reflection_function, getClosure, arginfo_reflection__void, 0) - {NULL, NULL, NULL} + PHP_FE_END }; ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_method_export, 0, 0, 2) @@ -5615,7 +5615,7 @@ static const zend_function_entry reflection_method_functions[] = { ZEND_ME(reflection_method, getDeclaringClass, arginfo_reflection__void, 0) ZEND_ME(reflection_method, getPrototype, arginfo_reflection__void, 0) ZEND_ME(reflection_property, setAccessible, arginfo_reflection_method_setAccessible, 0) - {NULL, NULL, NULL} + PHP_FE_END }; @@ -5740,7 +5740,7 @@ static const zend_function_entry reflection_class_functions[] = { ZEND_ME(reflection_class, inNamespace, arginfo_reflection__void, 0) ZEND_ME(reflection_class, getNamespaceName, arginfo_reflection__void, 0) ZEND_ME(reflection_class, getShortName, arginfo_reflection__void, 0) - {NULL, NULL, NULL} + PHP_FE_END }; @@ -5756,7 +5756,7 @@ ZEND_END_ARG_INFO() static const zend_function_entry reflection_object_functions[] = { ZEND_ME(reflection_object, export, arginfo_reflection_object_export, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC) ZEND_ME(reflection_object, __construct, arginfo_reflection_object___construct, 0) - {NULL, NULL, NULL} + PHP_FE_END }; @@ -5801,7 +5801,7 @@ static const zend_function_entry reflection_property_functions[] = { ZEND_ME(reflection_property, getDeclaringClass, arginfo_reflection__void, 0) ZEND_ME(reflection_property, getDocComment, arginfo_reflection__void, 0) ZEND_ME(reflection_property, setAccessible, arginfo_reflection_property_setAccessible, 0) - {NULL, NULL, NULL} + PHP_FE_END }; ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_parameter_export, 0, 0, 2) @@ -5832,7 +5832,7 @@ static const zend_function_entry reflection_parameter_functions[] = { ZEND_ME(reflection_parameter, isOptional, arginfo_reflection__void, 0) ZEND_ME(reflection_parameter, isDefaultValueAvailable, arginfo_reflection__void, 0) ZEND_ME(reflection_parameter, getDefaultValue, arginfo_reflection__void, 0) - {NULL, NULL, NULL} + PHP_FE_END }; ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_extension_export, 0, 0, 1) @@ -5860,7 +5860,7 @@ static const zend_function_entry reflection_extension_functions[] = { ZEND_ME(reflection_extension, info, arginfo_reflection__void, 0) ZEND_ME(reflection_extension, isPersistent, arginfo_reflection__void, 0) ZEND_ME(reflection_extension, isTemporary, arginfo_reflection__void, 0) - {NULL, NULL, NULL} + PHP_FE_END }; ZEND_BEGIN_ARG_INFO(arginfo_reflection_zend_extension___construct, 0) @@ -5877,12 +5877,12 @@ static const zend_function_entry reflection_zend_extension_functions[] = { ZEND_ME(reflection_zend_extension, getAuthor, arginfo_reflection__void, 0) ZEND_ME(reflection_zend_extension, getURL, arginfo_reflection__void, 0) ZEND_ME(reflection_zend_extension, getCopyright, arginfo_reflection__void, 0) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ const zend_function_entry reflection_ext_functions[] = { /* {{{ */ - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ static zend_object_handlers *zend_std_obj_handlers; diff --git a/ext/session/session.c b/ext/session/session.c index 08449e2b66..16528e2d73 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -1904,7 +1904,7 @@ static const zend_function_entry session_functions[] = { PHP_FE(session_get_cookie_params, arginfo_session_void) PHP_FE(session_write_close, arginfo_session_void) PHP_FALIAS(session_commit, session_write_close, arginfo_session_void) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/shmop/shmop.c b/ext/shmop/shmop.c index 9d0b0f8ac3..1982763a23 100644 --- a/ext/shmop/shmop.c +++ b/ext/shmop/shmop.c @@ -87,7 +87,7 @@ const zend_function_entry shmop_functions[] = { PHP_FE(shmop_size, arginfo_shmop_size) PHP_FE(shmop_write, arginfo_shmop_write) PHP_FE(shmop_delete, arginfo_shmop_delete) - {NULL, NULL, NULL} /* Must be the last line in shmop_functions[] */ + PHP_FE_END }; /* }}} */ diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index 2ec0ca4ab8..6f4e366108 100644 --- a/ext/simplexml/simplexml.c +++ b/ext/simplexml/simplexml.c @@ -2546,7 +2546,7 @@ const zend_function_entry simplexml_functions[] = { /* {{{ */ PHP_FE(simplexml_load_file, arginfo_simplexml_load_file) PHP_FE(simplexml_load_string, arginfo_simplexml_load_string) PHP_FE(simplexml_import_dom, arginfo_simplexml_import_dom) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ @@ -2593,7 +2593,7 @@ static const zend_function_entry sxe_functions[] = { /* {{{ */ SXE_ME(addAttribute, arginfo_simplexmlelement_addchild, ZEND_ACC_PUBLIC) SXE_ME(__toString, arginfo_simplexmlelement__void, ZEND_ACC_PUBLIC) SXE_ME(count, arginfo_simplexmlelement__void, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/skeleton/skeleton.c b/ext/skeleton/skeleton.c index 42685757da..920354a066 100644 --- a/ext/skeleton/skeleton.c +++ b/ext/skeleton/skeleton.c @@ -23,7 +23,7 @@ static int le_extname; const zend_function_entry extname_functions[] = { PHP_FE(confirm_extname_compiled, NULL) /* For testing, remove later. */ /* __function_entries_here__ */ - {NULL, NULL, NULL} /* Must be the last line in extname_functions[] */ + PHP_FE_END /* Must be the last line in extname_functions[] */ }; /* }}} */ diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c index 4ec880e8ca..28613e7415 100644 --- a/ext/snmp/snmp.c +++ b/ext/snmp/snmp.c @@ -402,7 +402,7 @@ const zend_function_entry snmp_functions[] = { PHP_FE(snmp_get_valueretrieval, arginfo_snmp_get_valueretrieval) PHP_FE(snmp_read_mib, arginfo_snmp_read_mib) - {NULL,NULL,NULL} + PHP_FE_END }; /* }}} */ @@ -2207,7 +2207,7 @@ static zend_function_entry php_snmp_class_methods[] = { PHP_ME(snmp, getErrno, arginfo_snmp_void, ZEND_ACC_PUBLIC) PHP_ME(snmp, getError, arginfo_snmp_void, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; #define PHP_SNMP_PROPERTY_ENTRY_RECORD(name) \ diff --git a/ext/soap/soap.c b/ext/soap/soap.c index 89e7204157..aa6cf65e09 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -377,13 +377,13 @@ ZEND_END_ARG_INFO() static const zend_function_entry soap_functions[] = { PHP_FE(use_soap_error_handler, arginfo_soap_use_soap_error_handler) PHP_FE(is_soap_fault, arginfo_soap_is_soap_fault) - {NULL, NULL, NULL} + PHP_FE_END }; static const zend_function_entry soap_fault_functions[] = { SOAP_CTOR(SoapFault, SoapFault, arginfo_soapfault_soapfault, 0) PHP_ME(SoapFault, __toString, arginfo_soap__void, 0) - {NULL, NULL, NULL} + PHP_FE_END }; static const zend_function_entry soap_server_functions[] = { @@ -396,7 +396,7 @@ static const zend_function_entry soap_server_functions[] = { PHP_ME(SoapServer, handle, arginfo_soapserver_handle, 0) PHP_ME(SoapServer, fault, arginfo_soapserver_fault, 0) PHP_ME(SoapServer, addSoapHeader, arginfo_soapserver_addsoapheader, 0) - {NULL, NULL, NULL} + PHP_FE_END }; static const zend_function_entry soap_client_functions[] = { @@ -413,22 +413,22 @@ static const zend_function_entry soap_client_functions[] = { PHP_ME(SoapClient, __setCookie, arginfo_soapclient___setcookie, 0) PHP_ME(SoapClient, __setLocation, arginfo_soapclient___setlocation, 0) PHP_ME(SoapClient, __setSoapHeaders, arginfo_soapclient___setsoapheaders, 0) - {NULL, NULL, NULL} + PHP_FE_END }; static const zend_function_entry soap_var_functions[] = { SOAP_CTOR(SoapVar, SoapVar, arginfo_soapvar_soapvar, 0) - {NULL, NULL, NULL} + PHP_FE_END }; static const zend_function_entry soap_param_functions[] = { SOAP_CTOR(SoapParam, SoapParam, arginfo_soapparam_soapparam, 0) - {NULL, NULL, NULL} + PHP_FE_END }; static const zend_function_entry soap_header_functions[] = { SOAP_CTOR(SoapHeader, SoapHeader, arginfo_soapheader_soapheader, 0) - {NULL, NULL, NULL} + PHP_FE_END }; zend_module_entry soap_module_entry = { diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index 6b5631c9fb..9c034a3f27 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -314,7 +314,7 @@ const zend_function_entry sockets_functions[] = { PHP_FALIAS(socket_getopt, socket_get_option, arginfo_socket_get_option) PHP_FALIAS(socket_setopt, socket_set_option, arginfo_socket_set_option) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index 8b49b6c5e1..5caa4c9825 100755 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -1012,14 +1012,14 @@ const zend_function_entry spl_functions[] = { PHP_FE(spl_autoload_call, arginfo_spl_autoload_call) PHP_FE(class_parents, arginfo_class_parents) PHP_FE(class_implements, arginfo_class_implements) - PHP_FE(class_uses, arginfo_class_uses) + PHP_FE(class_uses, arginfo_class_uses) PHP_FE(spl_object_hash, arginfo_spl_object_hash) #ifdef SPL_ITERATORS_H PHP_FE(iterator_to_array, arginfo_iterator_to_array) PHP_FE(iterator_count, arginfo_iterator) PHP_FE(iterator_apply, arginfo_iterator_apply) #endif /* SPL_ITERATORS_H */ - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c index ed87df36ca..a4eecedfd6 100755 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@ -1861,7 +1861,7 @@ static const zend_function_entry spl_funcs_ArrayObject[] = { SPL_ME(Array, exchangeArray, arginfo_array_exchangeArray, ZEND_ACC_PUBLIC) SPL_ME(Array, setIteratorClass, arginfo_array_setIteratorClass, ZEND_ACC_PUBLIC) SPL_ME(Array, getIteratorClass, arginfo_array_void, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; static const zend_function_entry spl_funcs_ArrayIterator[] = { @@ -1890,13 +1890,13 @@ static const zend_function_entry spl_funcs_ArrayIterator[] = { SPL_ME(Array, next, arginfo_array_void, ZEND_ACC_PUBLIC) SPL_ME(Array, valid, arginfo_array_void, ZEND_ACC_PUBLIC) SPL_ME(Array, seek, arginfo_array_seek, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; static const zend_function_entry spl_funcs_RecursiveArrayIterator[] = { SPL_ME(Array, hasChildren, arginfo_array_void, ZEND_ACC_PUBLIC) SPL_ME(Array, getChildren, arginfo_array_void, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index 3c70550975..81de56c7ce 100755 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -1918,7 +1918,7 @@ static const zend_function_entry spl_SplFileInfo_functions[] = { SPL_ME(SplFileInfo, setFileClass, arginfo_info_optinalFileClass, ZEND_ACC_PUBLIC) SPL_ME(SplFileInfo, setInfoClass, arginfo_info_optinalFileClass, ZEND_ACC_PUBLIC) SPL_MA(SplFileInfo, __toString, SplFileInfo, getPathname, arginfo_splfileinfo_void, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; ZEND_BEGIN_ARG_INFO(arginfo_dir___construct, 0) @@ -1944,7 +1944,7 @@ static const zend_function_entry spl_DirectoryIterator_functions[] = { SPL_ME(DirectoryIterator, next, arginfo_splfileinfo_void, ZEND_ACC_PUBLIC) SPL_ME(DirectoryIterator, seek, arginfo_dir_it_seek, ZEND_ACC_PUBLIC) SPL_MA(DirectoryIterator, __toString, DirectoryIterator, getFilename, arginfo_splfileinfo_void, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; ZEND_BEGIN_ARG_INFO_EX(arginfo_r_dir___construct, 0, 0, 1) @@ -1968,7 +1968,7 @@ static const zend_function_entry spl_FilesystemIterator_functions[] = { SPL_ME(FilesystemIterator, current, arginfo_splfileinfo_void, ZEND_ACC_PUBLIC) SPL_ME(FilesystemIterator, getFlags, arginfo_splfileinfo_void, ZEND_ACC_PUBLIC) SPL_ME(FilesystemIterator, setFlags, arginfo_r_dir_setFlags, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; static const zend_function_entry spl_RecursiveDirectoryIterator_functions[] = { @@ -1977,14 +1977,14 @@ static const zend_function_entry spl_RecursiveDirectoryIterator_functions[] = { SPL_ME(RecursiveDirectoryIterator, getChildren, arginfo_splfileinfo_void, ZEND_ACC_PUBLIC) SPL_ME(RecursiveDirectoryIterator, getSubPath, arginfo_splfileinfo_void, ZEND_ACC_PUBLIC) SPL_ME(RecursiveDirectoryIterator, getSubPathname,arginfo_splfileinfo_void, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; #ifdef HAVE_GLOB static const zend_function_entry spl_GlobIterator_functions[] = { SPL_ME(GlobIterator, __construct, arginfo_r_dir___construct, ZEND_ACC_PUBLIC) SPL_ME(GlobIterator, count, arginfo_splfileinfo_void, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; #endif /* }}} */ @@ -2928,7 +2928,7 @@ static const zend_function_entry spl_SplFileObject_functions[] = { /* mappings */ SPL_MA(SplFileObject, getCurrentLine, SplFileObject, fgets, arginfo_splfileinfo_void, ZEND_ACC_PUBLIC) SPL_MA(SplFileObject, __toString, SplFileObject, current, arginfo_splfileinfo_void, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; ZEND_BEGIN_ARG_INFO_EX(arginfo_temp_file_object___construct, 0, 0, 0) @@ -2937,7 +2937,7 @@ ZEND_END_ARG_INFO() static const zend_function_entry spl_SplTempFileObject_functions[] = { SPL_ME(SplTempFileObject, __construct, arginfo_temp_file_object___construct, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/spl/spl_dllist.c b/ext/spl/spl_dllist.c index 06d22e1b61..5d8ff80d81 100644 --- a/ext/spl/spl_dllist.c +++ b/ext/spl/spl_dllist.c @@ -1302,7 +1302,7 @@ ZEND_END_ARG_INFO(); static const zend_function_entry spl_funcs_SplQueue[] = { SPL_MA(SplQueue, enqueue, SplDoublyLinkedList, push, arginfo_dllist_push, ZEND_ACC_PUBLIC) SPL_MA(SplQueue, dequeue, SplDoublyLinkedList, shift, arginfo_dllist_void, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; static const zend_function_entry spl_funcs_SplDoublyLinkedList[] = { @@ -1332,7 +1332,7 @@ static const zend_function_entry spl_funcs_SplDoublyLinkedList[] = { /* Serializable */ SPL_ME(SplDoublyLinkedList, unserialize, arginfo_dllist_serialized, ZEND_ACC_PUBLIC) SPL_ME(SplDoublyLinkedList, serialize, arginfo_dllist_void, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c index 89c4130bdf..c49528e89f 100644 --- a/ext/spl/spl_fixedarray.c +++ b/ext/spl/spl_fixedarray.c @@ -1073,7 +1073,7 @@ static zend_function_entry spl_funcs_SplFixedArray[] = { /* {{{ */ SPL_ME(SplFixedArray, key, arginfo_splfixedarray_void, ZEND_ACC_PUBLIC) SPL_ME(SplFixedArray, next, arginfo_splfixedarray_void, ZEND_ACC_PUBLIC) SPL_ME(SplFixedArray, valid, arginfo_splfixedarray_void, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index e062486731..57f3d5200f 100755 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -69,7 +69,7 @@ ZEND_END_ARG_INFO() const zend_function_entry spl_funcs_RecursiveIterator[] = { SPL_ABSTRACT_ME(RecursiveIterator, hasChildren, arginfo_recursive_it_void) SPL_ABSTRACT_ME(RecursiveIterator, getChildren, arginfo_recursive_it_void) - {NULL, NULL, NULL} + PHP_FE_END }; typedef enum { @@ -990,7 +990,7 @@ static const zend_function_entry spl_funcs_RecursiveIteratorIterator[] = { SPL_ME(RecursiveIteratorIterator, nextElement, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) SPL_ME(RecursiveIteratorIterator, setMaxDepth, arginfo_recursive_it_setMaxDepth, ZEND_ACC_PUBLIC) SPL_ME(RecursiveIteratorIterator, getMaxDepth, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; static void spl_recursive_tree_iterator_get_prefix(spl_recursive_it_object *object, zval *return_value TSRMLS_DC) @@ -1268,7 +1268,7 @@ static const zend_function_entry spl_funcs_RecursiveTreeIterator[] = { SPL_ME(RecursiveTreeIterator, setPrefixPart, arginfo_recursive_tree_it_setPrefixPart, ZEND_ACC_PUBLIC) SPL_ME(RecursiveTreeIterator, getEntry, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) SPL_ME(RecursiveTreeIterator, getPostfix, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; #if MBO_0 @@ -2306,7 +2306,7 @@ static const zend_function_entry spl_funcs_FilterIterator[] = { SPL_ME(FilterIterator, next, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) SPL_ME(dual_it, getInnerIterator, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) SPL_ABSTRACT_ME(FilterIterator, accept, arginfo_recursive_it_void) - {NULL, NULL, NULL} + PHP_FE_END }; ZEND_BEGIN_ARG_INFO(arginfo_callback_filter_it___construct, 0) @@ -2317,7 +2317,7 @@ ZEND_END_ARG_INFO(); static const zend_function_entry spl_funcs_CallbackFilterIterator[] = { SPL_ME(CallbackFilterIterator, __construct, arginfo_callback_filter_it___construct, ZEND_ACC_PUBLIC) SPL_ME(CallbackFilterIterator, accept, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; ZEND_BEGIN_ARG_INFO(arginfo_recursive_callback_filter_it___construct, 0) @@ -2329,7 +2329,7 @@ static const zend_function_entry spl_funcs_RecursiveCallbackFilterIterator[] = { SPL_ME(RecursiveCallbackFilterIterator, __construct, arginfo_recursive_callback_filter_it___construct, ZEND_ACC_PUBLIC) SPL_ME(RecursiveFilterIterator, hasChildren, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) SPL_ME(RecursiveCallbackFilterIterator, getChildren, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; ZEND_BEGIN_ARG_INFO(arginfo_parent_it___construct, 0) @@ -2340,13 +2340,13 @@ static const zend_function_entry spl_funcs_RecursiveFilterIterator[] = { SPL_ME(RecursiveFilterIterator, __construct, arginfo_parent_it___construct, ZEND_ACC_PUBLIC) SPL_ME(RecursiveFilterIterator, hasChildren, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) SPL_ME(RecursiveFilterIterator, getChildren, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; static const zend_function_entry spl_funcs_ParentIterator[] = { SPL_ME(ParentIterator, __construct, arginfo_parent_it___construct, ZEND_ACC_PUBLIC) SPL_MA(ParentIterator, accept, RecursiveFilterIterator, hasChildren, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; #if HAVE_PCRE || HAVE_BUNDLED_PCRE @@ -2380,7 +2380,7 @@ static const zend_function_entry spl_funcs_RegexIterator[] = { SPL_ME(RegexIterator, getPregFlags, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) SPL_ME(RegexIterator, setPregFlags, arginfo_regex_it_set_preg_flags, ZEND_ACC_PUBLIC) SPL_ME(RegexIterator, getRegex, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; ZEND_BEGIN_ARG_INFO_EX(arginfo_rec_regex_it___construct, 0, 0, 2) @@ -2395,7 +2395,7 @@ static const zend_function_entry spl_funcs_RecursiveRegexIterator[] = { SPL_ME(RecursiveRegexIterator, __construct, arginfo_rec_regex_it___construct, ZEND_ACC_PUBLIC) SPL_ME(RecursiveFilterIterator, hasChildren, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) SPL_ME(RecursiveRegexIterator, getChildren, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; #endif @@ -2524,7 +2524,7 @@ ZEND_END_ARG_INFO(); static const zend_function_entry spl_funcs_SeekableIterator[] = { SPL_ABSTRACT_ME(SeekableIterator, seek, arginfo_seekable_it_seek) - {NULL, NULL, NULL} + PHP_FE_END }; ZEND_BEGIN_ARG_INFO_EX(arginfo_limit_it___construct, 0, 0, 1) @@ -2547,7 +2547,7 @@ static const zend_function_entry spl_funcs_LimitIterator[] = { SPL_ME(LimitIterator, seek, arginfo_limit_it_seek, ZEND_ACC_PUBLIC) SPL_ME(LimitIterator, getPosition, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) SPL_ME(dual_it, getInnerIterator, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; static inline int spl_caching_it_valid(spl_dual_it_object *intern TSRMLS_DC) @@ -2978,7 +2978,7 @@ static const zend_function_entry spl_funcs_CachingIterator[] = { SPL_ME(CachingIterator, offsetExists, arginfo_caching_it_offsetGet, ZEND_ACC_PUBLIC) SPL_ME(CachingIterator, getCache, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) SPL_ME(CachingIterator, count, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; /* {{{ proto void RecursiveCachingIterator::__construct(RecursiveIterator it [, flags = CIT_CALL_TOSTRING]) @@ -3031,7 +3031,7 @@ static const zend_function_entry spl_funcs_RecursiveCachingIterator[] = { SPL_ME(RecursiveCachingIterator, __construct, arginfo_caching_rec_it___construct, ZEND_ACC_PUBLIC) SPL_ME(RecursiveCachingIterator, hasChildren, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) SPL_ME(RecursiveCachingIterator, getChildren, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; /* {{{ proto void IteratorIterator::__construct(Traversable it) @@ -3053,7 +3053,7 @@ static const zend_function_entry spl_funcs_IteratorIterator[] = { SPL_ME(dual_it, current, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) SPL_ME(dual_it, next, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) SPL_ME(dual_it, getInnerIterator, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; /* {{{ proto void NoRewindIterator::__construct(Iterator it) @@ -3162,7 +3162,7 @@ static const zend_function_entry spl_funcs_NoRewindIterator[] = { SPL_ME(NoRewindIterator, current, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) SPL_ME(NoRewindIterator, next, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) SPL_ME(dual_it, getInnerIterator, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; /* {{{ proto void InfiniteIterator::__construct(Iterator it) @@ -3198,7 +3198,7 @@ SPL_METHOD(InfiniteIterator, next) static const zend_function_entry spl_funcs_InfiniteIterator[] = { SPL_ME(InfiniteIterator, __construct, arginfo_norewind_it___construct, ZEND_ACC_PUBLIC) SPL_ME(InfiniteIterator, next, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; /* {{{ proto void EmptyIterator::rewind() @@ -3255,7 +3255,7 @@ static const zend_function_entry spl_funcs_EmptyIterator[] = { SPL_ME(EmptyIterator, key, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) SPL_ME(EmptyIterator, current, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) SPL_ME(EmptyIterator, next, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; int spl_append_it_next_iterator(spl_dual_it_object *intern TSRMLS_DC) /* {{{*/ @@ -3432,7 +3432,7 @@ static const zend_function_entry spl_funcs_AppendIterator[] = { SPL_ME(dual_it, getInnerIterator, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) SPL_ME(AppendIterator, getIteratorIndex, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) SPL_ME(AppendIterator, getArrayIterator, arginfo_recursive_it_void, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; PHPAPI int spl_iterator_apply(zval *obj, spl_iterator_apply_func_t apply_func, void *puser TSRMLS_DC) @@ -3624,12 +3624,12 @@ PHP_FUNCTION(iterator_apply) static const zend_function_entry spl_funcs_OuterIterator[] = { SPL_ABSTRACT_ME(OuterIterator, getInnerIterator, arginfo_recursive_it_void) - {NULL, NULL, NULL} + PHP_FE_END }; static const zend_function_entry spl_funcs_Countable[] = { SPL_ABSTRACT_ME(Countable, count, arginfo_recursive_it_void) - {NULL, NULL, NULL} + PHP_FE_END }; /* {{{ PHP_MINIT_FUNCTION(spl_iterators) diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index 9c922414b8..a4f35aeeb7 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -1813,7 +1813,7 @@ static zend_function_entry php_sqlite3_class_methods[] = { PHP_ME(sqlite3, enableExceptions, argingo_sqlite3_enableexceptions, ZEND_ACC_PUBLIC) /* Aliases */ PHP_MALIAS(sqlite3, __construct, open, arginfo_sqlite3_open, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ @@ -1828,7 +1828,7 @@ static zend_function_entry php_sqlite3_stmt_class_methods[] = { PHP_ME(sqlite3stmt, bindValue, arginfo_sqlite3stmt_bindvalue, ZEND_ACC_PUBLIC) PHP_ME(sqlite3stmt, readOnly, arginfo_sqlite3_void, ZEND_ACC_PUBLIC) PHP_ME(sqlite3stmt, __construct, arginfo_sqlite3stmt_construct, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ @@ -1841,7 +1841,7 @@ static zend_function_entry php_sqlite3_result_class_methods[] = { PHP_ME(sqlite3result, reset, arginfo_sqlite3_void, ZEND_ACC_PUBLIC) PHP_ME(sqlite3result, finalize, arginfo_sqlite3_void, ZEND_ACC_PUBLIC) PHP_ME(sqlite3result, __construct, arginfo_sqlite3_void, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 4b5b9fe2c2..cafc633a8a 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -3375,7 +3375,7 @@ const zend_function_entry basic_functions[] = { /* {{{ */ PHP_FE(sys_get_temp_dir, arginfo_sys_get_temp_dir) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c index c07cdcd7e6..3c8b7bd223 100644 --- a/ext/sybase_ct/php_sybase_ct.c +++ b/ext/sybase_ct/php_sybase_ct.c @@ -204,7 +204,7 @@ const zend_function_entry sybase_functions[] = { PHP_FALIAS(mssql_set_message_handler, sybase_set_message_handler, arginfo_sybase_set_message_handler) PHP_FALIAS(mssql_deadlock_retry_count, sybase_deadlock_retry_count, arginfo_sybase_deadlock_retry_count) #endif - {NULL, NULL, NULL} + PHP_FE_END }; zend_module_entry sybase_module_entry = { diff --git a/ext/sysvmsg/sysvmsg.c b/ext/sysvmsg/sysvmsg.c index 048a89f694..d2b93eb4ef 100644 --- a/ext/sysvmsg/sysvmsg.c +++ b/ext/sysvmsg/sysvmsg.c @@ -95,7 +95,7 @@ const zend_function_entry sysvmsg_functions[] = { PHP_FE(msg_stat_queue, arginfo_msg_stat_queue) PHP_FE(msg_set_queue, arginfo_msg_set_queue) PHP_FE(msg_queue_exists, arginfo_msg_queue_exists) - {NULL, NULL, NULL} /* Must be the last line in sysvmsg_functions[] */ + PHP_FE_END }; /* }}} */ diff --git a/ext/sysvsem/sysvsem.c b/ext/sysvsem/sysvsem.c index c19a47b9fc..67ac97d564 100644 --- a/ext/sysvsem/sysvsem.c +++ b/ext/sysvsem/sysvsem.c @@ -84,7 +84,7 @@ const zend_function_entry sysvsem_functions[] = { PHP_FE(sem_acquire, arginfo_sem_acquire) PHP_FE(sem_release, arginfo_sem_release) PHP_FE(sem_remove, arginfo_sem_remove) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c index 0c910fe077..33b1070325 100644 --- a/ext/sysvshm/sysvshm.c +++ b/ext/sysvshm/sysvshm.c @@ -86,7 +86,7 @@ const zend_function_entry sysvshm_functions[] = { PHP_FE(shm_has_var, arginfo_shm_has_var) PHP_FE(shm_get_var, arginfo_shm_get_var) PHP_FE(shm_remove_var, arginfo_shm_remove_var) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c index 2b859683f3..1ba910c957 100644 --- a/ext/tidy/tidy.c +++ b/ext/tidy/tidy.c @@ -400,7 +400,7 @@ static const zend_function_entry tidy_functions[] = { PHP_FE(tidy_get_head, arginfo_tidy_get_head) PHP_FE(tidy_get_html, arginfo_tidy_get_html) PHP_FE(tidy_get_body, arginfo_tidy_get_body) - {NULL, NULL, NULL} + PHP_FE_END }; static const zend_function_entry tidy_funcs_doc[] = { @@ -425,7 +425,7 @@ static const zend_function_entry tidy_funcs_doc[] = { TIDY_METHOD_MAP(html, tidy_get_html, NULL) TIDY_METHOD_MAP(body, tidy_get_body, NULL) TIDY_DOC_ME(__construct, NULL) - {NULL, NULL, NULL} + PHP_FE_END }; static const zend_function_entry tidy_funcs_node[] = { @@ -439,7 +439,7 @@ static const zend_function_entry tidy_funcs_node[] = { TIDY_NODE_ME(isPhp, NULL) TIDY_NODE_ME(getParent, NULL) TIDY_NODE_PRIVATE_ME(__construct, NULL) - {NULL, NULL, NULL} + PHP_FE_END }; static zend_class_entry *tidy_ce_doc, *tidy_ce_node; diff --git a/ext/tokenizer/tokenizer.c b/ext/tokenizer/tokenizer.c index add3168f7c..c6c901f352 100644 --- a/ext/tokenizer/tokenizer.c +++ b/ext/tokenizer/tokenizer.c @@ -52,7 +52,7 @@ ZEND_END_ARG_INFO() const zend_function_entry tokenizer_functions[] = { PHP_FE(token_get_all, arginfo_token_get_all) PHP_FE(token_name, arginfo_token_name) - {NULL, NULL, NULL} /* Must be the last line in tokenizer_functions[] */ + PHP_FE_END }; /* }}} */ diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c index 477793cb5e..13345017a0 100644 --- a/ext/wddx/wddx.c +++ b/ext/wddx/wddx.c @@ -141,7 +141,7 @@ const zend_function_entry wddx_functions[] = { PHP_FE(wddx_packet_end, arginfo_wddx_packet_end) PHP_FE(wddx_add_vars, arginfo_wddx_add_vars) PHP_FE(wddx_deserialize, arginfo_wddx_deserialize) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/xml/xml.c b/ext/xml/xml.c index e9c3a6ad91..d7d2d7df41 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -238,7 +238,7 @@ const zend_function_entry xml_functions[] = { PHP_FE(xml_parser_get_option, arginfo_xml_parser_get_option) PHP_FE(utf8_encode, arginfo_utf8_encode) PHP_FE(utf8_decode, arginfo_utf8_decode) - {NULL, NULL, NULL} + PHP_FE_END }; #ifdef LIBXML_EXPAT_COMPAT diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c index 83d8f5ca8d..f875896026 100644 --- a/ext/xmlreader/php_xmlreader.c +++ b/ext/xmlreader/php_xmlreader.c @@ -1306,7 +1306,7 @@ static const zend_function_entry xmlreader_functions[] = { PHP_ME(xmlreader, setRelaxNGSchemaSource, arginfo_xmlreader_setRelaxNGSchemaSource, ZEND_ACC_PUBLIC) PHP_ME(xmlreader, XML, arginfo_xmlreader_XML, ZEND_ACC_PUBLIC|ZEND_ACC_ALLOW_STATIC) PHP_ME(xmlreader, expand, arginfo_xmlreader_expand, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; /* {{{ PHP_MINIT_FUNCTION diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index f3d144818a..87c93e220a 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -158,7 +158,7 @@ const zend_function_entry xmlrpc_functions[] = { PHP_FE(xmlrpc_parse_method_descriptions, arginfo_xmlrpc_parse_method_descriptions) PHP_FE(xmlrpc_server_add_introspection_data, arginfo_xmlrpc_server_add_introspection_data) PHP_FE(xmlrpc_server_register_introspection_callback, arginfo_xmlrpc_server_register_introspection_callback) - {NULL, NULL, NULL} + PHP_FE_END }; zend_module_entry xmlrpc_module_entry = { diff --git a/ext/xmlwriter/php_xmlwriter.c b/ext/xmlwriter/php_xmlwriter.c index c0609fb108..4ea895374e 100644 --- a/ext/xmlwriter/php_xmlwriter.c +++ b/ext/xmlwriter/php_xmlwriter.c @@ -526,7 +526,7 @@ static const zend_function_entry xmlwriter_functions[] = { #endif PHP_FE(xmlwriter_output_memory, arginfo_xmlwriter_output_memory) PHP_FE(xmlwriter_flush, arginfo_xmlwriter_flush) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/xsl/php_xsl.c b/ext/xsl/php_xsl.c index 13ed910b5d..896c28596c 100644 --- a/ext/xsl/php_xsl.c +++ b/ext/xsl/php_xsl.c @@ -35,7 +35,7 @@ static zend_object_handlers xsl_object_handlers; * Every user visible function must have an entry in xsl_functions[]. */ const zend_function_entry xsl_functions[] = { - {NULL, NULL, NULL} /* Must be the last line in xsl_functions[] */ + PHP_FE_END }; /* }}} */ diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 3aa3988e8e..d13757403c 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -781,8 +781,7 @@ static const zend_function_entry zip_functions[] = { PHP_FE(zip_entry_name, arginfo_zip_entry_name) PHP_FE(zip_entry_compressedsize, arginfo_zip_entry_compressedsize) PHP_FE(zip_entry_compressionmethod, arginfo_zip_entry_compressionmethod) - - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 0f61bfde91..b5300fc334 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -737,7 +737,7 @@ static const zend_function_entry php_zlib_functions[] = { PHP_FE(zlib_encode, arginfo_zlib_encode) PHP_FE(zlib_decode, arginfo_zlib_decode) PHP_FE(zlib_get_coding_type, arginfo_zlib_get_coding_type) - {NULL, NULL, NULL} + PHP_FE_END }; /* }}} */ |