From 86e4f55f9a1c6e440607475504a63ed3bafa80a5 Mon Sep 17 00:00:00 2001 From: Gabriel Caruso Date: Sat, 17 Feb 2018 01:41:41 -0200 Subject: [PATCH] Use ZEND_PARSE_PARAMETERS_NONE() macro --- Zend/zend_builtin_functions.c | 28 +- Zend/zend_exceptions.c | 23 +- Zend/zend_generators.c | 28 +- ext/com_dotnet/com_com.c | 4 +- ext/curl/curl_file.c | 5 +- ext/curl/multi.c | 4 +- ext/curl/share.c | 4 +- ext/date/php_date.c | 25 +- ext/dom/node.c | 4 +- ext/dom/php_dom.h | 5 - ext/enchant/enchant.c | 4 +- ext/filter/filter.c | 4 +- ext/gd/gd.c | 12 +- ext/hash/hash.c | 6 +- ext/imap/php_imap.c | 12 +- ext/interbase/interbase.c | 8 +- ext/json/json.c | 8 +- ext/mbstring/mbstring.c | 4 +- ext/mysqli/mysqli_nonapi.c | 7 +- ext/odbc/php_odbc.c | 4 +- ext/openssl/openssl.c | 4 +- ext/pdo/pdo.c | 4 +- ext/pdo/pdo_dbh.c | 33 +- ext/pdo/pdo_stmt.c | 14 +- ext/phar/phar_object.c | 111 ++---- ext/posix/posix.c | 20 +- ext/readline/readline.c | 8 +- ext/reflection/php_reflection.c | 554 +++++++++++----------------- ext/session/mod_user_class.c | 4 +- ext/session/session.c | 36 +- ext/simplexml/simplexml.c | 4 +- ext/simplexml/sxe.c | 28 +- ext/snmp/snmp.c | 4 +- ext/soap/soap.c | 37 +- ext/sodium/libsodium.c | 75 ++-- ext/spl/php_spl.c | 4 +- ext/spl/spl_array.c | 48 +-- ext/spl/spl_directory.c | 138 ++----- ext/spl/spl_dllist.c | 56 +-- ext/spl/spl_fixedarray.c | 36 +- ext/spl/spl_heap.c | 62 +--- ext/spl/spl_iterators.c | 269 ++++---------- ext/spl/spl_observer.c | 53 +-- ext/sqlite3/sqlite3.c | 60 +-- ext/standard/basic_functions.c | 39 +- ext/standard/dir.c | 4 +- ext/standard/dns.c | 4 +- ext/standard/file.c | 9 +- ext/standard/filestat.c | 9 +- ext/standard/head.c | 4 +- ext/standard/info.c | 12 +- ext/standard/lcg.c | 5 +- ext/standard/mt_rand.c | 5 +- ext/standard/pageinfo.c | 20 +- ext/standard/streamsfuncs.c | 8 +- ext/standard/string.c | 4 +- ext/standard/syslog.c | 4 +- ext/standard/user_filters.c | 4 +- ext/tidy/tidy.c | 12 +- ext/xmlrpc/xmlrpc-epi-php.c | 5 +- ext/xmlwriter/php_xmlwriter.c | 5 +- ext/zlib/zlib.c | 5 +- main/output.c | 40 +- sapi/apache2handler/php_functions.c | 8 +- sapi/cgi/cgi_main.c | 14 +- sapi/cli/php_cli_process_title.c | 4 +- sapi/cli/php_cli_server.c | 8 +- sapi/phpdbg/phpdbg.c | 8 +- win32/codepage.c | 6 +- 69 files changed, 647 insertions(+), 1460 deletions(-) diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 987d70ab3ef15..b24f53492de51 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -912,9 +912,7 @@ ZEND_FUNCTION(get_called_class) { zend_class_entry *called_scope; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); called_scope = zend_get_called_scope(execute_data); if (called_scope) { @@ -1544,9 +1542,7 @@ ZEND_FUNCTION(get_included_files) { zend_string *entry; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); array_init(return_value); ZEND_HASH_FOREACH_STR_KEY(&EG(included_files), entry) { @@ -1628,9 +1624,7 @@ ZEND_FUNCTION(set_error_handler) Restores the previously defined error handler function */ ZEND_FUNCTION(restore_error_handler) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (Z_TYPE(EG(user_error_handler)) != IS_UNDEF) { zval zeh; @@ -1693,9 +1687,7 @@ ZEND_FUNCTION(set_exception_handler) Restores the previously defined exception handler function */ ZEND_FUNCTION(restore_exception_handler) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (Z_TYPE(EG(user_exception_handler)) != IS_UNDEF) { zval_ptr_dtor(&EG(user_exception_handler)); @@ -1739,9 +1731,7 @@ ZEND_FUNCTION(get_declared_traits) uint32_t mask = ZEND_ACC_TRAIT; uint32_t comply = 1; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); array_init(return_value); zend_hash_apply_with_arguments(EG(class_table), copy_class_or_interface_name, 3, return_value, mask, comply); @@ -1755,9 +1745,7 @@ ZEND_FUNCTION(get_declared_classes) uint32_t mask = ZEND_ACC_INTERFACE | ZEND_ACC_TRAIT; uint32_t comply = 0; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); array_init(return_value); zend_hash_apply_with_arguments(EG(class_table), copy_class_or_interface_name, 3, return_value, mask, comply); @@ -1771,9 +1759,7 @@ ZEND_FUNCTION(get_declared_interfaces) uint32_t mask = ZEND_ACC_INTERFACE; uint32_t comply = 1; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); array_init(return_value); zend_hash_apply_with_arguments(EG(class_table), copy_class_or_interface_name, 3, return_value, mask, comply); diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index 626932826ebe6..56012ec4b7834 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -386,11 +386,6 @@ ZEND_METHOD(error_exception, __construct) } /* }}} */ -#define DEFAULT_0_PARAMS \ - if (zend_parse_parameters_none() == FAILURE) { \ - return; \ - } - #define GET_PROPERTY(object, id) \ zend_read_property_ex(i_get_exception_base(object), (object), ZSTR_KNOWN(id), 0, &rv) #define GET_PROPERTY_SILENT(object, id) \ @@ -402,7 +397,7 @@ ZEND_METHOD(exception, getFile) { zval rv; - DEFAULT_0_PARAMS; + ZEND_PARSE_PARAMETERS_NONE(); ZVAL_COPY(return_value, GET_PROPERTY(getThis(), ZEND_STR_FILE)); } @@ -414,7 +409,7 @@ ZEND_METHOD(exception, getLine) { zval rv; - DEFAULT_0_PARAMS; + ZEND_PARSE_PARAMETERS_NONE(); ZVAL_COPY(return_value, GET_PROPERTY(getThis(), ZEND_STR_LINE)); } @@ -426,7 +421,7 @@ ZEND_METHOD(exception, getMessage) { zval rv; - DEFAULT_0_PARAMS; + ZEND_PARSE_PARAMETERS_NONE(); ZVAL_COPY(return_value, GET_PROPERTY(getThis(), ZEND_STR_MESSAGE)); } @@ -438,7 +433,7 @@ ZEND_METHOD(exception, getCode) { zval rv; - DEFAULT_0_PARAMS; + ZEND_PARSE_PARAMETERS_NONE(); ZVAL_COPY(return_value, GET_PROPERTY(getThis(), ZEND_STR_CODE)); } @@ -450,7 +445,7 @@ ZEND_METHOD(exception, getTrace) { zval rv; - DEFAULT_0_PARAMS; + ZEND_PARSE_PARAMETERS_NONE(); ZVAL_COPY(return_value, GET_PROPERTY(getThis(), ZEND_STR_TRACE)); } @@ -462,7 +457,7 @@ ZEND_METHOD(error_exception, getSeverity) { zval rv; - DEFAULT_0_PARAMS; + ZEND_PARSE_PARAMETERS_NONE(); ZVAL_COPY(return_value, GET_PROPERTY(getThis(), ZEND_STR_SEVERITY)); } @@ -608,7 +603,7 @@ ZEND_METHOD(exception, getTraceAsString) smart_str str = {0}; uint32_t num = 0; - DEFAULT_0_PARAMS; + ZEND_PARSE_PARAMETERS_NONE(); object = getThis(); base_ce = i_get_exception_base(object); @@ -641,7 +636,7 @@ ZEND_METHOD(exception, getPrevious) { zval rv; - DEFAULT_0_PARAMS; + ZEND_PARSE_PARAMETERS_NONE(); ZVAL_COPY(return_value, GET_PROPERTY_SILENT(getThis(), ZEND_STR_PREVIOUS)); } /* }}} */ @@ -657,7 +652,7 @@ ZEND_METHOD(exception, __toString) zval rv, tmp; zend_string *fname; - DEFAULT_0_PARAMS; + ZEND_PARSE_PARAMETERS_NONE(); str = ZSTR_EMPTY_ALLOC(); diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c index 07d247d0683d3..ce0281faf5a8f 100644 --- a/Zend/zend_generators.c +++ b/Zend/zend_generators.c @@ -837,9 +837,7 @@ ZEND_METHOD(Generator, rewind) { zend_generator *generator; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); generator = (zend_generator *) Z_OBJ_P(getThis()); @@ -853,9 +851,7 @@ ZEND_METHOD(Generator, valid) { zend_generator *generator; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); generator = (zend_generator *) Z_OBJ_P(getThis()); @@ -873,9 +869,7 @@ ZEND_METHOD(Generator, current) { zend_generator *generator, *root; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); generator = (zend_generator *) Z_OBJ_P(getThis()); @@ -897,9 +891,7 @@ ZEND_METHOD(Generator, key) { zend_generator *generator, *root; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); generator = (zend_generator *) Z_OBJ_P(getThis()); @@ -921,9 +913,7 @@ ZEND_METHOD(Generator, next) { zend_generator *generator; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); generator = (zend_generator *) Z_OBJ_P(getThis()); @@ -1016,9 +1006,7 @@ ZEND_METHOD(Generator, getReturn) { zend_generator *generator; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); generator = (zend_generator *) Z_OBJ_P(getThis()); @@ -1046,9 +1034,7 @@ ZEND_METHOD(Generator, __wakeup) * because it is only invoked for C unserialization. For O the error has * to be thrown in __wakeup. */ - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); zend_throw_exception(NULL, "Unserialization of 'Generator' is not allowed", 0); } diff --git a/ext/com_dotnet/com_com.c b/ext/com_dotnet/com_com.c index f91c5fcbb9c0e..24f3c9772cc74 100644 --- a/ext/com_dotnet/com_com.c +++ b/ext/com_dotnet/com_com.c @@ -674,9 +674,7 @@ PHP_FUNCTION(com_create_guid) GUID retval; OLECHAR *guid_string; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); php_com_initialize(); if (CoCreateGuid(&retval) == S_OK && StringFromCLSID(&retval, &guid_string) == S_OK) { diff --git a/ext/curl/curl_file.c b/ext/curl/curl_file.c index 8b476372fa771..887361a25143d 100644 --- a/ext/curl/curl_file.c +++ b/ext/curl/curl_file.c @@ -74,9 +74,8 @@ static void curlfile_get_property(char *name, size_t name_len, INTERNAL_FUNCTION { zval *res, rv; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + res = zend_read_property(curl_CURLFile_class, getThis(), name, name_len, 1, &rv); ZVAL_DEREF(res); ZVAL_COPY(return_value, res); diff --git a/ext/curl/multi.c b/ext/curl/multi.c index 21956746e32da..ce72f95cf6501 100644 --- a/ext/curl/multi.c +++ b/ext/curl/multi.c @@ -57,9 +57,7 @@ PHP_FUNCTION(curl_multi_init) { php_curlm *mh; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); mh = ecalloc(1, sizeof(php_curlm)); mh->multi = curl_multi_init(); diff --git a/ext/curl/share.c b/ext/curl/share.c index 34e52a6e1ba91..81841bf84e5dc 100644 --- a/ext/curl/share.c +++ b/ext/curl/share.c @@ -40,9 +40,7 @@ PHP_FUNCTION(curl_share_init) { php_curlsh *sh; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); sh = ecalloc(1, sizeof(php_curlsh)); diff --git a/ext/date/php_date.c b/ext/date/php_date.c index be1df2d81cedd..8ef00326ec163 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -626,9 +626,7 @@ static zend_object_handlers date_object_handlers_period; php_date_obj *obj; \ DATE_SET_CONTEXT; \ if (object) { \ - if (zend_parse_parameters_none() == FAILURE) { \ - return; \ - } \ + ZEND_PARSE_PARAMETERS_NONE(); \ } else { \ if (zend_parse_method_parameters(ZEND_NUM_ARGS(), NULL, "O", &object, date_ce_date) == FAILURE) { \ RETURN_FALSE; \ @@ -1764,9 +1762,7 @@ PHP_FUNCTION(gmstrftime) Return current UNIX timestamp */ PHP_FUNCTION(time) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_LONG((zend_long)time(NULL)); } @@ -4661,9 +4657,7 @@ PHP_METHOD(DatePeriod, getStartDate) php_period_obj *dpobj; php_date_obj *dateobj; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); dpobj = Z_PHPPERIOD_P(getThis()); @@ -4688,9 +4682,7 @@ PHP_METHOD(DatePeriod, getEndDate) php_period_obj *dpobj; php_date_obj *dateobj; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); dpobj = Z_PHPPERIOD_P(getThis()); @@ -4719,9 +4711,7 @@ PHP_METHOD(DatePeriod, getDateInterval) php_period_obj *dpobj; php_interval_obj *diobj; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); dpobj = Z_PHPPERIOD_P(getThis()); @@ -4865,9 +4855,8 @@ PHP_FUNCTION(date_default_timezone_set) PHP_FUNCTION(date_default_timezone_get) { timelib_tzinfo *default_tz; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + + ZEND_PARSE_PARAMETERS_NONE(); default_tz = get_timezone_info(); RETVAL_STRING(default_tz->name); diff --git a/ext/dom/node.c b/ext/dom/node.c index 7d640ff6c5869..390a6042b7c6c 100644 --- a/ext/dom/node.c +++ b/ext/dom/node.c @@ -1893,9 +1893,7 @@ PHP_METHOD(domnode, getLineNo) xmlNode *nodep; dom_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); DOM_GET_THIS_OBJ(nodep, id, xmlNodePtr, intern); diff --git a/ext/dom/php_dom.h b/ext/dom/php_dom.h index 4bebf2fef308f..734b357a6c99d 100644 --- a/ext/dom/php_dom.h +++ b/ext/dom/php_dom.h @@ -143,11 +143,6 @@ entry = zend_register_internal_class_ex(&ce, parent_ce); } \ } -#define DOM_NO_ARGS() \ - if (zend_parse_parameters_none() == FAILURE) { \ - return; \ - } - #define DOM_NOT_IMPLEMENTED() \ php_error_docref(NULL, E_WARNING, "Not yet implemented"); \ return; diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c index 46981694d210a..d610dad0445cb 100644 --- a/ext/enchant/enchant.c +++ b/ext/enchant/enchant.c @@ -353,9 +353,7 @@ PHP_FUNCTION(enchant_broker_init) enchant_broker *broker; EnchantBroker *pbroker; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); pbroker = enchant_broker_init(); diff --git a/ext/filter/filter.c b/ext/filter/filter.c index 8ed8427bc44f2..90c94218f040d 100644 --- a/ext/filter/filter.c +++ b/ext/filter/filter.c @@ -856,9 +856,7 @@ PHP_FUNCTION(filter_list) { int i, size = sizeof(filter_list) / sizeof(filter_list_entry); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); array_init(return_value); for (i = 0; i < size; ++i) { diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 1549fab217db1..0f02cb7d3eea4 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -1323,9 +1323,7 @@ PHP_MINFO_FUNCTION(gd) */ PHP_FUNCTION(gd_info) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); array_init(return_value); @@ -2023,9 +2021,7 @@ PHP_FUNCTION(imagegrabscreen) gdImagePtr im; hdc = GetDC(0); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (!hdc) { RETURN_FALSE; @@ -2194,9 +2190,7 @@ PHP_FUNCTION(imagetypes) ret |= PHP_IMG_BMP; #endif - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_LONG(ret); } diff --git a/ext/hash/hash.c b/ext/hash/hash.c index 25d022a6e368b..dc9759bbdd218 100644 --- a/ext/hash/hash.c +++ b/ext/hash/hash.c @@ -999,9 +999,8 @@ PHP_FUNCTION(mhash_get_hash_name) Gets the number of available hashes */ PHP_FUNCTION(mhash_count) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + RETURN_LONG(MHASH_NUM_ALGOS - 1); } /* }}} */ @@ -1503,4 +1502,3 @@ ZEND_GET_MODULE(hash) * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ - diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index d5f07a3e22eef..a54b90e14c07e 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -4166,9 +4166,7 @@ PHP_FUNCTION(imap_alerts) { STRINGLIST *cur=NIL; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (IMAPG(imap_alertstack) == NIL) { RETURN_FALSE; @@ -4193,9 +4191,7 @@ PHP_FUNCTION(imap_errors) { ERRORLIST *cur=NIL; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (IMAPG(imap_errorstack) == NIL) { RETURN_FALSE; @@ -4220,9 +4216,7 @@ PHP_FUNCTION(imap_last_error) { ERRORLIST *cur=NIL; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (IMAPG(imap_errorstack) == NIL) { RETURN_FALSE; diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c index 288534728adec..2729a7f17ad48 100644 --- a/ext/interbase/interbase.c +++ b/ext/interbase/interbase.c @@ -477,9 +477,7 @@ int le_link, le_plink, le_trans; Return error message */ PHP_FUNCTION(ibase_errmsg) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (IBG(sql_code) != 0) { RETURN_STRING(IBG(errmsg)); @@ -493,9 +491,7 @@ PHP_FUNCTION(ibase_errmsg) Return error code */ PHP_FUNCTION(ibase_errcode) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (IBG(sql_code) != 0) { RETURN_LONG(IBG(sql_code)); diff --git a/ext/json/json.c b/ext/json/json.c index d89e355503278..1d451f57ef5a7 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -366,9 +366,7 @@ static PHP_FUNCTION(json_decode) Returns the error code of the last json_encode() or json_decode() call. */ static PHP_FUNCTION(json_last_error) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_LONG(JSON_G(error_code)); } @@ -378,9 +376,7 @@ static PHP_FUNCTION(json_last_error) Returns the error string of the last json_encode() or json_decode() call. */ static PHP_FUNCTION(json_last_error_msg) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_STRING(php_json_get_error_msg(JSON_G(error_code))); } diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 5f11a510aaba4..5273d8557b66a 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -3443,9 +3443,7 @@ PHP_FUNCTION(mb_list_encodings) const mbfl_encoding *encoding; int i; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); array_init(return_value); i = 0; diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index 3de335cf2cc01..b71d441c967f0 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -380,10 +380,9 @@ PHP_FUNCTION(mysqli_fetch_all) Returns statistics about the zval cache */ PHP_FUNCTION(mysqli_get_client_stats) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } - mysqlnd_get_client_stats(return_value); + ZEND_PARSE_PARAMETERS_NONE(); + + mysqlnd_get_client_stats(return_value); } /* }}} */ diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index fefb6d91b259d..b357e70746bba 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -1140,9 +1140,7 @@ PHP_FUNCTION(odbc_close_all) { zend_resource *p; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); /* Loop through list and close all statements */ ZEND_HASH_FOREACH_PTR(&EG(regular_list), p) { diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index c9b06cb40db9e..0ee682e888f75 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -5897,9 +5897,7 @@ PHP_FUNCTION(openssl_error_string) char buf[256]; unsigned long val; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); php_openssl_store_errors(); diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c index ef1296019dfce..9e79ebb290726 100644 --- a/ext/pdo/pdo.c +++ b/ext/pdo/pdo.c @@ -91,9 +91,7 @@ PHP_FUNCTION(pdo_drivers) { pdo_driver_t *pdriver; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); array_init(return_value); diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c index e78baea762778..c63a7660ee54e 100644 --- a/ext/pdo/pdo_dbh.c +++ b/ext/pdo/pdo_dbh.c @@ -561,9 +561,8 @@ static PHP_METHOD(PDO, beginTransaction) { pdo_dbh_t *dbh = Z_PDO_DBH_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + PDO_CONSTRUCT_CHECK; if (dbh->in_txn) { @@ -594,9 +593,8 @@ static PHP_METHOD(PDO, commit) { pdo_dbh_t *dbh = Z_PDO_DBH_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + PDO_CONSTRUCT_CHECK; if (!dbh->in_txn) { @@ -620,9 +618,8 @@ static PHP_METHOD(PDO, rollBack) { pdo_dbh_t *dbh = Z_PDO_DBH_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + PDO_CONSTRUCT_CHECK; if (!dbh->in_txn) { @@ -646,9 +643,8 @@ static PHP_METHOD(PDO, inTransaction) { pdo_dbh_t *dbh = Z_PDO_DBH_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + PDO_CONSTRUCT_CHECK; if (!dbh->methods->in_transaction) { @@ -970,9 +966,8 @@ static PHP_METHOD(PDO, errorCode) { pdo_dbh_t *dbh = Z_PDO_DBH_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + PDO_CONSTRUCT_CHECK; if (dbh->query_stmt) { @@ -1001,9 +996,7 @@ static PHP_METHOD(PDO, errorInfo) pdo_dbh_t *dbh = Z_PDO_DBH_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); PDO_CONSTRUCT_CHECK; @@ -1177,9 +1170,7 @@ static PHP_METHOD(PDO, getAvailableDrivers) { pdo_driver_t *pdriver; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); array_init(return_value); diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c index 01c429c8ce3fc..dd8975b56ffa3 100644 --- a/ext/pdo/pdo_stmt.c +++ b/ext/pdo/pdo_stmt.c @@ -1640,9 +1640,7 @@ static PHP_METHOD(PDOStatement, errorCode) { PHP_STMT_GET_OBJ; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (stmt->error_code[0] == '\0') { RETURN_NULL(); @@ -1662,9 +1660,7 @@ static PHP_METHOD(PDOStatement, errorInfo) PHP_STMT_GET_OBJ; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); array_init(return_value); add_next_index_string(return_value, stmt->error_code); @@ -1775,9 +1771,9 @@ static PHP_METHOD(PDOStatement, getAttribute) static PHP_METHOD(PDOStatement, columnCount) { PHP_STMT_GET_OBJ; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + + ZEND_PARSE_PARAMETERS_NONE(); + RETURN_LONG(stmt->column_count); } /* }}} */ diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 41fb6b4e01fc9..68baa1d30c5d5 100644 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -926,9 +926,8 @@ PHP_METHOD(Phar, mungServer) */ PHP_METHOD(Phar, interceptFileFuncs) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + phar_intercept_functions(); } /* }}} */ @@ -1006,9 +1005,8 @@ PHP_METHOD(Phar, loadPhar) * Returns the api version */ PHP_METHOD(Phar, apiVersion) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + RETURN_STRINGL(PHP_PHAR_API_VERSION, sizeof(PHP_PHAR_API_VERSION)-1); } /* }}}*/ @@ -1051,9 +1049,8 @@ PHP_METHOD(Phar, canCompress) * Returns whether phar extension supports writing and creating phars */ PHP_METHOD(Phar, canWrite) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + RETURN_BOOL(!PHAR_G(readonly)); } /* }}} */ @@ -1255,9 +1252,7 @@ PHP_METHOD(Phar, __construct) */ PHP_METHOD(Phar, getSupportedSignatures) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); array_init(return_value); @@ -1282,9 +1277,7 @@ PHP_METHOD(Phar, getSupportedSignatures) */ PHP_METHOD(Phar, getSupportedCompression) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); array_init(return_value); phar_request_initialize(); @@ -2567,9 +2560,7 @@ PHP_METHOD(Phar, isCompressed) { PHAR_ARCHIVE_OBJECT(); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (phar_obj->archive->flags & PHAR_FILE_COMPRESSED_GZ) { RETURN_LONG(PHAR_ENT_COMPRESSED_GZ); @@ -2591,9 +2582,7 @@ PHP_METHOD(Phar, isWritable) php_stream_statbuf ssb; PHAR_ARCHIVE_OBJECT(); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (!phar_obj->archive->is_writeable) { RETURN_FALSE; @@ -2669,9 +2658,7 @@ PHP_METHOD(Phar, getAlias) { PHAR_ARCHIVE_OBJECT(); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (phar_obj->archive->alias && phar_obj->archive->alias != phar_obj->archive->fname) { RETURN_STRINGL(phar_obj->archive->alias, phar_obj->archive->alias_len); @@ -2686,9 +2673,7 @@ PHP_METHOD(Phar, getPath) { PHAR_ARCHIVE_OBJECT(); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_STRINGL(phar_obj->archive->fname, phar_obj->archive->fname_len); } @@ -2803,9 +2788,7 @@ PHP_METHOD(Phar, getVersion) { PHAR_ARCHIVE_OBJECT(); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_STRING(phar_obj->archive->version); } @@ -2818,9 +2801,7 @@ PHP_METHOD(Phar, startBuffering) { PHAR_ARCHIVE_OBJECT(); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); phar_obj->archive->donotflush = 1; } @@ -2833,9 +2814,7 @@ PHP_METHOD(Phar, isBuffering) { PHAR_ARCHIVE_OBJECT(); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_BOOL(phar_obj->archive->donotflush); } @@ -2850,9 +2829,7 @@ PHP_METHOD(Phar, stopBuffering) PHAR_ARCHIVE_OBJECT(); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (PHAR_G(readonly) && !phar_obj->archive->is_data) { zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0, @@ -3086,9 +3063,7 @@ PHP_METHOD(Phar, getSignature) { PHAR_ARCHIVE_OBJECT(); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (phar_obj->archive->signature) { zend_string *unknown; @@ -3129,9 +3104,7 @@ PHP_METHOD(Phar, getModified) { PHAR_ARCHIVE_OBJECT(); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_BOOL(phar_obj->archive->is_modified); } @@ -3391,9 +3364,7 @@ PHP_METHOD(Phar, decompressFiles) char *error; PHAR_ARCHIVE_OBJECT(); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (PHAR_G(readonly) && !phar_obj->archive->is_data) { zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, @@ -3896,9 +3867,7 @@ PHP_METHOD(Phar, getStub) PHAR_ARCHIVE_OBJECT(); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (phar_obj->archive->is_tar || phar_obj->archive->is_zip) { @@ -4000,9 +3969,7 @@ PHP_METHOD(Phar, getMetadata) { PHAR_ARCHIVE_OBJECT(); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (Z_TYPE(phar_obj->archive->metadata) != IS_UNDEF) { if (phar_obj->archive->is_persistent) { @@ -4521,9 +4488,7 @@ PHP_METHOD(PharFileInfo, getCompressedSize) { PHAR_ENTRY_OBJECT(); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_LONG(entry_obj->entry->compressed_filesize); } @@ -4563,9 +4528,7 @@ PHP_METHOD(PharFileInfo, getCRC32) { PHAR_ENTRY_OBJECT(); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (entry_obj->entry->is_dir) { zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, \ @@ -4589,9 +4552,7 @@ PHP_METHOD(PharFileInfo, isCRCChecked) { PHAR_ENTRY_OBJECT(); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_BOOL(entry_obj->entry->is_crc_checked); } @@ -4604,9 +4565,7 @@ PHP_METHOD(PharFileInfo, getPharFlags) { PHAR_ENTRY_OBJECT(); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_LONG(entry_obj->entry->flags & ~(PHAR_ENT_PERM_MASK|PHAR_ENT_COMPRESSION_MASK)); } @@ -4682,9 +4641,7 @@ PHP_METHOD(PharFileInfo, hasMetadata) { PHAR_ENTRY_OBJECT(); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_BOOL(Z_TYPE(entry_obj->entry->metadata) != IS_UNDEF); } @@ -4697,9 +4654,7 @@ PHP_METHOD(PharFileInfo, getMetadata) { PHAR_ENTRY_OBJECT(); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (Z_TYPE(entry_obj->entry->metadata) != IS_UNDEF) { if (entry_obj->entry->is_persistent) { @@ -4776,9 +4731,7 @@ PHP_METHOD(PharFileInfo, delMetadata) PHAR_ENTRY_OBJECT(); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (PHAR_G(readonly) && !entry_obj->entry->phar->is_data) { zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, "Write operations disabled by the php.ini setting phar.readonly"); @@ -4835,9 +4788,7 @@ PHP_METHOD(PharFileInfo, getContent) PHAR_ENTRY_OBJECT(); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (entry_obj->entry->is_dir) { zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, @@ -5009,9 +4960,7 @@ PHP_METHOD(PharFileInfo, decompress) char *error; PHAR_ENTRY_OBJECT(); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (entry_obj->entry->is_dir) { zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, \ diff --git a/ext/posix/posix.c b/ext/posix/posix.c index 8d39c720cef13..c0b3943c6ab11 100644 --- a/ext/posix/posix.c +++ b/ext/posix/posix.c @@ -434,10 +434,8 @@ zend_module_entry posix_module_entry = { ZEND_GET_MODULE(posix) #endif -#define PHP_POSIX_NO_ARGS if (zend_parse_parameters_none() == FAILURE) return; - #define PHP_POSIX_RETURN_LONG_FUNC(func_name) \ - PHP_POSIX_NO_ARGS \ + ZEND_PARSE_PARAMETERS_NONE(); \ RETURN_LONG(func_name()); #define PHP_POSIX_SINGLE_ARG_FUNC(func_name) \ @@ -565,7 +563,7 @@ PHP_FUNCTION(posix_getgroups) int result; int i; - PHP_POSIX_NO_ARGS; + ZEND_PARSE_PARAMETERS_NONE(); if ((result = getgroups(NGROUPS_MAX, gidlist)) < 0) { POSIX_G(last_error) = errno; @@ -588,7 +586,7 @@ PHP_FUNCTION(posix_getlogin) { char *p; - PHP_POSIX_NO_ARGS; + ZEND_PARSE_PARAMETERS_NONE(); if (NULL == (p = getlogin())) { POSIX_G(last_error) = errno; @@ -684,7 +682,7 @@ PHP_FUNCTION(posix_uname) { struct utsname u; - PHP_POSIX_NO_ARGS; + ZEND_PARSE_PARAMETERS_NONE(); if (uname(&u) < 0) { POSIX_G(last_error) = errno; @@ -716,7 +714,7 @@ PHP_FUNCTION(posix_times) struct tms t; clock_t ticks; - PHP_POSIX_NO_ARGS; + ZEND_PARSE_PARAMETERS_NONE(); if ((ticks = times(&t)) == -1) { POSIX_G(last_error) = errno; @@ -744,7 +742,7 @@ PHP_FUNCTION(posix_ctermid) { char buffer[L_ctermid]; - PHP_POSIX_NO_ARGS; + ZEND_PARSE_PARAMETERS_NONE(); if (NULL == ctermid(buffer)) { /* Found no documentation how the defined behaviour is when this @@ -876,7 +874,7 @@ PHP_FUNCTION(posix_getcwd) char buffer[MAXPATHLEN]; char *p; - PHP_POSIX_NO_ARGS; + ZEND_PARSE_PARAMETERS_NONE(); p = VCWD_GETCWD(buffer, MAXPATHLEN); if (!p) { @@ -1380,7 +1378,7 @@ PHP_FUNCTION(posix_getrlimit) { const struct limitlist *l = NULL; - PHP_POSIX_NO_ARGS; + ZEND_PARSE_PARAMETERS_NONE(); array_init(return_value); @@ -1428,7 +1426,7 @@ PHP_FUNCTION(posix_setrlimit) Retrieve the error number set by the last posix function which failed. */ PHP_FUNCTION(posix_get_last_error) { - PHP_POSIX_NO_ARGS; + ZEND_PARSE_PARAMETERS_NONE(); RETURN_LONG(POSIX_G(last_error)); } diff --git a/ext/readline/readline.c b/ext/readline/readline.c index 7026b020f68e4..24be1215d1370 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -381,9 +381,7 @@ PHP_FUNCTION(readline_add_history) Clears the history */ PHP_FUNCTION(readline_clear_history) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); #if HAVE_LIBEDIT /* clear_history is the only function where rl_initialize @@ -403,9 +401,7 @@ PHP_FUNCTION(readline_list_history) { HIST_ENTRY **history; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); history = history_list(); diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 87ffeba666ccd..ab066512f4df3 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -1094,9 +1094,8 @@ static void _function_check_flag(INTERNAL_FUNCTION_PARAMETERS, int mask) reflection_object *intern; zend_function *mptr; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(mptr); RETURN_BOOL(mptr->common.fn_flags & mask); } @@ -1606,9 +1605,8 @@ ZEND_METHOD(reflection_function, __toString) zend_function *fptr; smart_str str = {0}; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(fptr); _function_string(&str, fptr, intern->ce, ""); RETURN_STR(smart_str_extract(&str)); @@ -1619,9 +1617,8 @@ ZEND_METHOD(reflection_function, __toString) Returns this function's name */ ZEND_METHOD(reflection_function, getName) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + _default_get_name(getThis(), return_value); } /* }}} */ @@ -1633,9 +1630,8 @@ ZEND_METHOD(reflection_function, isClosure) reflection_object *intern; zend_function *fptr; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(fptr); RETURN_BOOL(fptr->common.fn_flags & ZEND_ACC_CLOSURE); } @@ -1648,9 +1644,8 @@ ZEND_METHOD(reflection_function, getClosureThis) reflection_object *intern; zval* closure_this; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT(); if (!Z_ISUNDEF(intern->obj)) { closure_this = zend_get_closure_this_ptr(&intern->obj); @@ -1668,9 +1663,8 @@ ZEND_METHOD(reflection_function, getClosureScopeClass) reflection_object *intern; const zend_function *closure_func; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT(); if (!Z_ISUNDEF(intern->obj)) { closure_func = zend_get_closure_method_def(&intern->obj); @@ -1688,9 +1682,8 @@ ZEND_METHOD(reflection_function, getClosure) reflection_object *intern; zend_function *fptr; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(fptr); if (!Z_ISUNDEF(intern->obj)) { @@ -1709,9 +1702,8 @@ ZEND_METHOD(reflection_function, isInternal) reflection_object *intern; zend_function *fptr; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(fptr); RETURN_BOOL(fptr->type == ZEND_INTERNAL_FUNCTION); } @@ -1724,9 +1716,8 @@ ZEND_METHOD(reflection_function, isUserDefined) reflection_object *intern; zend_function *fptr; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(fptr); RETURN_BOOL(fptr->type == ZEND_USER_FUNCTION); } @@ -1752,9 +1743,8 @@ ZEND_METHOD(reflection_function, getFileName) reflection_object *intern; zend_function *fptr; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(fptr); if (fptr->type == ZEND_USER_FUNCTION) { RETURN_STR_COPY(fptr->op_array.filename); @@ -1770,9 +1760,8 @@ ZEND_METHOD(reflection_function, getStartLine) reflection_object *intern; zend_function *fptr; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(fptr); if (fptr->type == ZEND_USER_FUNCTION) { RETURN_LONG(fptr->op_array.line_start); @@ -1788,9 +1777,8 @@ ZEND_METHOD(reflection_function, getEndLine) reflection_object *intern; zend_function *fptr; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(fptr); if (fptr->type == ZEND_USER_FUNCTION) { RETURN_LONG(fptr->op_array.line_end); @@ -1806,9 +1794,8 @@ ZEND_METHOD(reflection_function, getDocComment) reflection_object *intern; zend_function *fptr; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(fptr); if (fptr->type == ZEND_USER_FUNCTION && fptr->op_array.doc_comment) { RETURN_STR_COPY(fptr->op_array.doc_comment); @@ -1825,9 +1812,8 @@ ZEND_METHOD(reflection_function, getStaticVariables) zend_function *fptr; zval *val; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(fptr); /* Return an empty array in case no static variables exist */ @@ -2175,9 +2161,7 @@ ZEND_METHOD(reflection_generator, getExecutingLine) zend_generator *generator = (zend_generator *) Z_OBJ(Z_REFLECTION_P(getThis())->obj); zend_execute_data *ex = generator->execute_data; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); REFLECTION_CHECK_VALID_GENERATOR(ex) @@ -2191,9 +2175,7 @@ ZEND_METHOD(reflection_generator, getExecutingFile) zend_generator *generator = (zend_generator *) Z_OBJ(Z_REFLECTION_P(getThis())->obj); zend_execute_data *ex = generator->execute_data; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); REFLECTION_CHECK_VALID_GENERATOR(ex) @@ -2207,9 +2189,7 @@ ZEND_METHOD(reflection_generator, getFunction) zend_generator *generator = (zend_generator *) Z_OBJ(Z_REFLECTION_P(getThis())->obj); zend_execute_data *ex = generator->execute_data; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); REFLECTION_CHECK_VALID_GENERATOR(ex) @@ -2231,9 +2211,7 @@ ZEND_METHOD(reflection_generator, getThis) zend_generator *generator = (zend_generator *) Z_OBJ(Z_REFLECTION_P(getThis())->obj); zend_execute_data *ex = generator->execute_data; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); REFLECTION_CHECK_VALID_GENERATOR(ex) @@ -2252,9 +2230,7 @@ ZEND_METHOD(reflection_generator, getExecutingGenerator) zend_execute_data *ex = generator->execute_data; zend_generator *current; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); REFLECTION_CHECK_VALID_GENERATOR(ex) @@ -2477,9 +2453,8 @@ ZEND_METHOD(reflection_parameter, __toString) parameter_reference *param; smart_str str = {0}; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(param); _parameter_string(&str, param->fptr, param->arg_info, param->offset, param->required, ""); RETURN_STR(smart_str_extract(&str)); @@ -2491,9 +2466,8 @@ ZEND_METHOD(reflection_parameter, __toString) Returns this parameters's name */ ZEND_METHOD(reflection_parameter, getName) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + _default_get_name(getThis(), return_value); } /* }}} */ @@ -2505,9 +2479,8 @@ ZEND_METHOD(reflection_parameter, getDeclaringFunction) reflection_object *intern; parameter_reference *param; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(param); if (!param->fptr->common.scope) { @@ -2525,9 +2498,8 @@ ZEND_METHOD(reflection_parameter, getDeclaringClass) reflection_object *intern; parameter_reference *param; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(param); if (param->fptr->common.scope) { @@ -2544,9 +2516,8 @@ ZEND_METHOD(reflection_parameter, getClass) parameter_reference *param; zend_class_entry *ce; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(param); if (ZEND_TYPE_IS_CLASS(param->arg_info->type)) { @@ -2605,9 +2576,8 @@ ZEND_METHOD(reflection_parameter, hasType) reflection_object *intern; parameter_reference *param; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(param); RETVAL_BOOL(ZEND_TYPE_IS_SET(param->arg_info->type)); @@ -2621,9 +2591,8 @@ ZEND_METHOD(reflection_parameter, getType) reflection_object *intern; parameter_reference *param; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(param); if (!ZEND_TYPE_IS_SET(param->arg_info->type)) { @@ -2640,9 +2609,8 @@ ZEND_METHOD(reflection_parameter, isArray) reflection_object *intern; parameter_reference *param; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(param); RETVAL_BOOL(ZEND_TYPE_CODE(param->arg_info->type) == IS_ARRAY); @@ -2656,9 +2624,8 @@ ZEND_METHOD(reflection_parameter, isCallable) reflection_object *intern; parameter_reference *param; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(param); RETVAL_BOOL(ZEND_TYPE_CODE(param->arg_info->type) == IS_CALLABLE); @@ -2672,9 +2639,8 @@ ZEND_METHOD(reflection_parameter, allowsNull) reflection_object *intern; parameter_reference *param; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(param); RETVAL_BOOL(ZEND_TYPE_ALLOW_NULL(param->arg_info->type)); @@ -2688,9 +2654,8 @@ ZEND_METHOD(reflection_parameter, isPassedByReference) reflection_object *intern; parameter_reference *param; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(param); RETVAL_BOOL(param->arg_info->pass_by_reference); @@ -2704,9 +2669,8 @@ ZEND_METHOD(reflection_parameter, canBePassedByValue) reflection_object *intern; parameter_reference *param; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(param); /* true if it's ZEND_SEND_BY_VAL or ZEND_SEND_PREFER_REF */ @@ -2721,9 +2685,8 @@ ZEND_METHOD(reflection_parameter, getPosition) reflection_object *intern; parameter_reference *param; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(param); RETVAL_LONG(param->offset); @@ -2737,9 +2700,8 @@ ZEND_METHOD(reflection_parameter, isOptional) reflection_object *intern; parameter_reference *param; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(param); RETVAL_BOOL(!param->required); @@ -2754,9 +2716,8 @@ ZEND_METHOD(reflection_parameter, isDefaultValueAvailable) parameter_reference *param; zend_op *precv; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(param); if (param->fptr->type != ZEND_USER_FUNCTION) @@ -2779,9 +2740,7 @@ ZEND_METHOD(reflection_parameter, getDefaultValue) parameter_reference *param; zend_op *precv; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); param = _reflection_param_get_default_param(INTERNAL_FUNCTION_PARAM_PASSTHRU); if (!param) { @@ -2807,9 +2766,7 @@ ZEND_METHOD(reflection_parameter, isDefaultValueConstant) zend_op *precv; parameter_reference *param; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); param = _reflection_param_get_default_param(INTERNAL_FUNCTION_PARAM_PASSTHRU); if (!param) { @@ -2837,9 +2794,7 @@ ZEND_METHOD(reflection_parameter, getDefaultValueConstantName) zend_op *precv; parameter_reference *param; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); param = _reflection_param_get_default_param(INTERNAL_FUNCTION_PARAM_PASSTHRU); if (!param) { @@ -2866,9 +2821,8 @@ ZEND_METHOD(reflection_parameter, isVariadic) reflection_object *intern; parameter_reference *param; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(param); RETVAL_BOOL(param->arg_info->is_variadic); @@ -2882,9 +2836,8 @@ ZEND_METHOD(reflection_type, allowsNull) reflection_object *intern; type_reference *param; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(param); RETVAL_BOOL(ZEND_TYPE_ALLOW_NULL(param->arg_info->type)); @@ -2898,9 +2851,8 @@ ZEND_METHOD(reflection_type, isBuiltin) reflection_object *intern; type_reference *param; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(param); RETVAL_BOOL(ZEND_TYPE_IS_CODE(param->arg_info->type)); @@ -2925,9 +2877,8 @@ ZEND_METHOD(reflection_type, __toString) reflection_object *intern; type_reference *param; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(param); RETURN_STR(reflection_type_name(param)); @@ -2941,9 +2892,8 @@ ZEND_METHOD(reflection_named_type, getName) reflection_object *intern; type_reference *param; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(param); RETURN_STR(reflection_type_name(param)); @@ -3060,9 +3010,8 @@ ZEND_METHOD(reflection_method, __toString) zend_function *mptr; smart_str str = {0}; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(mptr); _function_string(&str, mptr, intern->ce, ""); RETURN_STR(smart_str_extract(&str)); @@ -3326,9 +3275,8 @@ ZEND_METHOD(reflection_function, inNamespace) zval *name; const char *backslash; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + if ((name = _default_load_name(getThis())) == NULL) { RETURN_FALSE; } @@ -3349,9 +3297,8 @@ ZEND_METHOD(reflection_function, getNamespaceName) zval *name; const char *backslash; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + if ((name = _default_load_name(getThis())) == NULL) { RETURN_FALSE; } @@ -3372,9 +3319,8 @@ ZEND_METHOD(reflection_function, getShortName) zval *name; const char *backslash; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + if ((name = _default_load_name(getThis())) == NULL) { RETURN_FALSE; } @@ -3396,9 +3342,7 @@ ZEND_METHOD(reflection_function, hasReturnType) reflection_object *intern; zend_function *fptr; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); GET_REFLECTION_OBJECT_PTR(fptr); @@ -3413,9 +3357,7 @@ ZEND_METHOD(reflection_function, getReturnType) reflection_object *intern; zend_function *fptr; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); GET_REFLECTION_OBJECT_PTR(fptr); @@ -3434,9 +3376,8 @@ ZEND_METHOD(reflection_method, isConstructor) reflection_object *intern; zend_function *mptr; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(mptr); /* we need to check if the ctor is the ctor of the class level we we * looking at since we might be looking at an inherited old style ctor @@ -3452,9 +3393,8 @@ ZEND_METHOD(reflection_method, isDestructor) reflection_object *intern; zend_function *mptr; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(mptr); RETURN_BOOL(mptr->common.fn_flags & ZEND_ACC_DTOR); } @@ -3469,9 +3409,8 @@ ZEND_METHOD(reflection_method, getModifiers) uint32_t keep_flags = ZEND_ACC_PPP_MASK | ZEND_ACC_IMPLICIT_PUBLIC | ZEND_ACC_STATIC | ZEND_ACC_ABSTRACT | ZEND_ACC_FINAL; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(mptr); RETURN_LONG((mptr->common.fn_flags & keep_flags)); @@ -3488,9 +3427,7 @@ ZEND_METHOD(reflection_method, getDeclaringClass) METHOD_NOTSTATIC(reflection_method_ptr); GET_REFLECTION_OBJECT_PTR(mptr); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); zend_reflection_class_factory(mptr->common.scope, return_value); } @@ -3506,9 +3443,7 @@ ZEND_METHOD(reflection_method, getPrototype) METHOD_NOTSTATIC(reflection_method_ptr); GET_REFLECTION_OBJECT_PTR(mptr); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (!mptr->common.prototype) { zend_throw_exception_ex(reflection_exception_ptr, 0, @@ -3599,9 +3534,8 @@ ZEND_METHOD(reflection_class_constant, __toString) smart_str str = {0}; zval name; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ref); _default_get_name(getThis(), &name); _class_const_string(&str, Z_STRVAL(name), ref, ""); @@ -3614,9 +3548,8 @@ ZEND_METHOD(reflection_class_constant, __toString) Returns the constant' name */ ZEND_METHOD(reflection_class_constant, getName) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + _default_get_name(getThis(), return_value); } /* }}} */ @@ -3626,9 +3559,8 @@ static void _class_constant_check_flag(INTERNAL_FUNCTION_PARAMETERS, int mask) / reflection_object *intern; zend_class_constant *ref; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ref); RETURN_BOOL(Z_ACCESS_FLAGS(ref->value) & mask); } @@ -3665,9 +3597,8 @@ ZEND_METHOD(reflection_class_constant, getModifiers) reflection_object *intern; zend_class_constant *ref; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ref); RETURN_LONG(Z_ACCESS_FLAGS(ref->value)); @@ -3681,9 +3612,8 @@ ZEND_METHOD(reflection_class_constant, getValue) reflection_object *intern; zend_class_constant *ref; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ref); ZVAL_COPY_OR_DUP(return_value, &ref->value); @@ -3700,9 +3630,8 @@ ZEND_METHOD(reflection_class_constant, getDeclaringClass) reflection_object *intern; zend_class_constant *ref; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ref); zend_reflection_class_factory(ref->ce, return_value); @@ -3716,9 +3645,8 @@ ZEND_METHOD(reflection_class_constant, getDocComment) reflection_object *intern; zend_class_constant *ref; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ref); if (ref->doc_comment) { RETURN_STR_COPY(ref->doc_comment); @@ -3840,9 +3768,7 @@ ZEND_METHOD(reflection_class, getStaticProperties) reflection_object *intern; zend_class_entry *ce; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); GET_REFLECTION_OBJECT_PTR(ce); @@ -3926,9 +3852,8 @@ ZEND_METHOD(reflection_class, getDefaultProperties) reflection_object *intern; zend_class_entry *ce; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ce); array_init(return_value); if (UNEXPECTED(zend_update_class_constants(ce) != SUCCESS)) { @@ -3947,9 +3872,8 @@ ZEND_METHOD(reflection_class, __toString) zend_class_entry *ce; smart_str str = {0}; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ce); _class_string(&str, ce, &intern->obj, ""); RETURN_STR(smart_str_extract(&str)); @@ -3960,9 +3884,8 @@ ZEND_METHOD(reflection_class, __toString) Returns the class' name */ ZEND_METHOD(reflection_class, getName) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + _default_get_name(getThis(), return_value); } /* }}} */ @@ -3974,9 +3897,8 @@ ZEND_METHOD(reflection_class, isInternal) reflection_object *intern; zend_class_entry *ce; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ce); RETURN_BOOL(ce->type == ZEND_INTERNAL_CLASS); } @@ -3989,9 +3911,8 @@ ZEND_METHOD(reflection_class, isUserDefined) reflection_object *intern; zend_class_entry *ce; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ce); RETURN_BOOL(ce->type == ZEND_USER_CLASS); } @@ -4004,9 +3925,8 @@ ZEND_METHOD(reflection_class, isAnonymous) reflection_object *intern; zend_class_entry *ce; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ce); RETURN_BOOL(ce->ce_flags & ZEND_ACC_ANON_CLASS); } @@ -4019,9 +3939,8 @@ ZEND_METHOD(reflection_class, getFileName) reflection_object *intern; zend_class_entry *ce; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ce); if (ce->type == ZEND_USER_CLASS) { RETURN_STR_COPY(ce->info.user.filename); @@ -4037,9 +3956,8 @@ ZEND_METHOD(reflection_class, getStartLine) reflection_object *intern; zend_class_entry *ce; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ce); if (ce->type == ZEND_USER_CLASS) { RETURN_LONG(ce->info.user.line_start); @@ -4055,9 +3973,8 @@ ZEND_METHOD(reflection_class, getEndLine) reflection_object *intern; zend_class_entry *ce; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ce); if (ce->type == ZEND_USER_CLASS) { RETURN_LONG(ce->info.user.line_end); @@ -4073,9 +3990,8 @@ ZEND_METHOD(reflection_class, getDocComment) reflection_object *intern; zend_class_entry *ce; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ce); if (ce->type == ZEND_USER_CLASS && ce->info.user.doc_comment) { RETURN_STR_COPY(ce->info.user.doc_comment); @@ -4091,9 +4007,8 @@ ZEND_METHOD(reflection_class, getConstructor) reflection_object *intern; zend_class_entry *ce; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ce); if (ce->constructor) { @@ -4475,9 +4390,8 @@ ZEND_METHOD(reflection_class, getConstants) zend_class_constant *c; zval val; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ce); array_init(return_value); ZEND_HASH_FOREACH_STR_KEY_PTR(&ce->constants_table, key, c) { @@ -4500,9 +4414,8 @@ ZEND_METHOD(reflection_class, getReflectionConstants) zend_string *name; zend_class_constant *constant; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ce); array_init(return_value); ZEND_HASH_FOREACH_STR_KEY_PTR(&ce->constants_table, name, constant) { @@ -4567,9 +4480,8 @@ static void _class_check_flag(INTERNAL_FUNCTION_PARAMETERS, int mask) reflection_object *intern; zend_class_entry *ce; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ce); RETVAL_BOOL(ce->ce_flags & mask); } @@ -4582,9 +4494,8 @@ ZEND_METHOD(reflection_class, isInstantiable) reflection_object *intern; zend_class_entry *ce; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ce); if (ce->ce_flags & (ZEND_ACC_INTERFACE | ZEND_ACC_TRAIT | ZEND_ACC_EXPLICIT_ABSTRACT_CLASS | ZEND_ACC_IMPLICIT_ABSTRACT_CLASS)) { RETURN_FALSE; @@ -4608,9 +4519,8 @@ ZEND_METHOD(reflection_class, isCloneable) zend_class_entry *ce; zval obj; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ce); if (ce->ce_flags & (ZEND_ACC_INTERFACE | ZEND_ACC_TRAIT | ZEND_ACC_EXPLICIT_ABSTRACT_CLASS | ZEND_ACC_IMPLICIT_ABSTRACT_CLASS)) { RETURN_FALSE; @@ -4676,9 +4586,8 @@ ZEND_METHOD(reflection_class, getModifiers) uint32_t keep_flags = ZEND_ACC_FINAL | ZEND_ACC_EXPLICIT_ABSTRACT_CLASS | ZEND_ACC_IMPLICIT_ABSTRACT_CLASS; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ce); RETURN_LONG((ce->ce_flags & keep_flags)); @@ -4884,9 +4793,8 @@ ZEND_METHOD(reflection_class, getInterfaces) reflection_object *intern; zend_class_entry *ce; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ce); if (ce->num_interfaces) { @@ -4912,9 +4820,8 @@ ZEND_METHOD(reflection_class, getInterfaceNames) zend_class_entry *ce; uint32_t i; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ce); if (!ce->num_interfaces) { @@ -4939,9 +4846,8 @@ ZEND_METHOD(reflection_class, getTraits) zend_class_entry *ce; uint32_t i; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ce); if (!ce->num_traits) { @@ -4967,9 +4873,8 @@ ZEND_METHOD(reflection_class, getTraitNames) zend_class_entry *ce; uint32_t i; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ce); if (!ce->num_traits) { @@ -4992,9 +4897,8 @@ ZEND_METHOD(reflection_class, getTraitAliases) reflection_object *intern; zend_class_entry *ce; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ce); @@ -5027,9 +4931,8 @@ ZEND_METHOD(reflection_class, getParentClass) reflection_object *intern; zend_class_entry *ce; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ce); if (ce->parent) { @@ -5140,9 +5043,7 @@ ZEND_METHOD(reflection_class, isIterable) reflection_object *intern; zend_class_entry *ce; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); METHOD_NOTSTATIC(reflection_class_ptr); GET_REFLECTION_OBJECT_PTR(ce); @@ -5163,9 +5064,7 @@ ZEND_METHOD(reflection_class, getExtension) reflection_object *intern; zend_class_entry *ce; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); METHOD_NOTSTATIC(reflection_class_ptr); GET_REFLECTION_OBJECT_PTR(ce); @@ -5183,9 +5082,7 @@ ZEND_METHOD(reflection_class, getExtensionName) reflection_object *intern; zend_class_entry *ce; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); METHOD_NOTSTATIC(reflection_class_ptr); GET_REFLECTION_OBJECT_PTR(ce); @@ -5205,9 +5102,8 @@ ZEND_METHOD(reflection_class, inNamespace) zval *name; const char *backslash; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + if ((name = _default_load_name(getThis())) == NULL) { RETURN_FALSE; } @@ -5228,9 +5124,8 @@ ZEND_METHOD(reflection_class, getNamespaceName) zval *name; const char *backslash; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + if ((name = _default_load_name(getThis())) == NULL) { RETURN_FALSE; } @@ -5251,9 +5146,8 @@ ZEND_METHOD(reflection_class, getShortName) zval *name; const char *backslash; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + if ((name = _default_load_name(getThis())) == NULL) { RETURN_FALSE; } @@ -5403,9 +5297,8 @@ ZEND_METHOD(reflection_property, __toString) property_reference *ref; smart_str str = {0}; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ref); _property_string(&str, &ref->prop, NULL, ""); RETURN_STR(smart_str_extract(&str)); @@ -5416,9 +5309,8 @@ ZEND_METHOD(reflection_property, __toString) Returns the class' name */ ZEND_METHOD(reflection_property, getName) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + _default_get_name(getThis(), return_value); } /* }}} */ @@ -5428,9 +5320,8 @@ static void _property_check_flag(INTERNAL_FUNCTION_PARAMETERS, int mask) /* {{{ reflection_object *intern; property_reference *ref; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ref); RETURN_BOOL(ref->prop.flags & mask); } @@ -5484,9 +5375,8 @@ ZEND_METHOD(reflection_property, getModifiers) property_reference *ref; uint32_t keep_flags = ZEND_ACC_PPP_MASK | ZEND_ACC_IMPLICIT_PUBLIC | ZEND_ACC_STATIC; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ref); RETURN_LONG((ref->prop.flags & keep_flags)); @@ -5625,9 +5515,8 @@ ZEND_METHOD(reflection_property, getDeclaringClass) const char *prop_name, *class_name; size_t prop_name_len; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ref); if (zend_unmangle_property_name_ex(ref->prop.name, &class_name, &prop_name, &prop_name_len) != SUCCESS) { @@ -5659,9 +5548,8 @@ ZEND_METHOD(reflection_property, getDocComment) reflection_object *intern; property_reference *ref; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(ref); if (ref->prop.doc_comment) { RETURN_STR_COPY(ref->prop.doc_comment); @@ -5739,9 +5627,8 @@ ZEND_METHOD(reflection_extension, __toString) zend_module_entry *module; smart_str str = {0}; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(module); _extension_string(&str, module, ""); RETURN_STR(smart_str_extract(&str)); @@ -5752,9 +5639,8 @@ ZEND_METHOD(reflection_extension, __toString) Returns this extension's name */ ZEND_METHOD(reflection_extension, getName) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + _default_get_name(getThis(), return_value); } /* }}} */ @@ -5766,9 +5652,8 @@ ZEND_METHOD(reflection_extension, getVersion) reflection_object *intern; zend_module_entry *module; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(module); /* An extension does not necessarily have a version number */ @@ -5789,9 +5674,8 @@ ZEND_METHOD(reflection_extension, getFunctions) zval function; zend_function *fptr; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(module); array_init(return_value); @@ -5827,9 +5711,8 @@ ZEND_METHOD(reflection_extension, getConstants) reflection_object *intern; zend_module_entry *module; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(module); array_init(return_value); @@ -5865,9 +5748,8 @@ ZEND_METHOD(reflection_extension, getINIEntries) reflection_object *intern; zend_module_entry *module; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(module); array_init(return_value); @@ -5911,9 +5793,8 @@ ZEND_METHOD(reflection_extension, getClasses) reflection_object *intern; zend_module_entry *module; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(module); array_init(return_value); @@ -5928,9 +5809,8 @@ ZEND_METHOD(reflection_extension, getClassNames) reflection_object *intern; zend_module_entry *module; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(module); array_init(return_value); @@ -5946,9 +5826,8 @@ ZEND_METHOD(reflection_extension, getDependencies) zend_module_entry *module; const zend_module_dep *dep; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(module); dep = module->deps; @@ -6012,9 +5891,8 @@ ZEND_METHOD(reflection_extension, info) reflection_object *intern; zend_module_entry *module; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(module); php_info_print_module(module); @@ -6028,9 +5906,8 @@ ZEND_METHOD(reflection_extension, isPersistent) reflection_object *intern; zend_module_entry *module; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(module); RETURN_BOOL(module->type == MODULE_PERSISTENT); @@ -6044,9 +5921,8 @@ ZEND_METHOD(reflection_extension, isTemporary) reflection_object *intern; zend_module_entry *module; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(module); RETURN_BOOL(module->type == MODULE_TEMPORARY); @@ -6101,9 +5977,8 @@ ZEND_METHOD(reflection_zend_extension, __toString) zend_extension *extension; smart_str str = {0}; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(extension); _zend_extension_string(&str, extension, ""); RETURN_STR(smart_str_extract(&str)); @@ -6117,9 +5992,8 @@ ZEND_METHOD(reflection_zend_extension, getName) reflection_object *intern; zend_extension *extension; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(extension); RETURN_STRING(extension->name); @@ -6133,9 +6007,8 @@ ZEND_METHOD(reflection_zend_extension, getVersion) reflection_object *intern; zend_extension *extension; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(extension); if (extension->version) { @@ -6153,9 +6026,8 @@ ZEND_METHOD(reflection_zend_extension, getAuthor) reflection_object *intern; zend_extension *extension; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(extension); if (extension->author) { @@ -6173,9 +6045,8 @@ ZEND_METHOD(reflection_zend_extension, getURL) reflection_object *intern; zend_extension *extension; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(extension); if (extension->URL) { @@ -6193,9 +6064,8 @@ ZEND_METHOD(reflection_zend_extension, getCopyright) reflection_object *intern; zend_extension *extension; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + GET_REFLECTION_OBJECT_PTR(extension); if (extension->copyright) { diff --git a/ext/session/mod_user_class.c b/ext/session/mod_user_class.c index 31488c194e127..90ded413d7203 100644 --- a/ext/session/mod_user_class.c +++ b/ext/session/mod_user_class.c @@ -171,9 +171,7 @@ PHP_METHOD(SessionHandler, create_sid) PS_SANITY_CHECK; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); id = PS(default_mod)->s_create_sid(&PS(mod_data)); diff --git a/ext/session/session.c b/ext/session/session.c index 4e5985e7ad377..2e0c4f8ce4978 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -1737,9 +1737,7 @@ static PHP_FUNCTION(session_set_cookie_params) Return the session cookie parameters */ static PHP_FUNCTION(session_get_cookie_params) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); array_init(return_value); @@ -2295,9 +2293,7 @@ static PHP_FUNCTION(session_encode) { zend_string *enc; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); enc = php_session_encode(); if (enc == NULL) { @@ -2424,9 +2420,7 @@ static PHP_FUNCTION(session_start) Destroy the current session and all data associated with it */ static PHP_FUNCTION(session_destroy) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_BOOL(php_session_destroy() == SUCCESS); } @@ -2436,9 +2430,7 @@ static PHP_FUNCTION(session_destroy) Unset all registered variables */ static PHP_FUNCTION(session_unset) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (PS(session_status) != php_session_active) { RETURN_FALSE; @@ -2461,9 +2453,7 @@ static PHP_FUNCTION(session_gc) { zend_long num; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (PS(session_status) != php_session_active) { php_error_docref(NULL, E_WARNING, "Session is not active"); @@ -2484,9 +2474,7 @@ static PHP_FUNCTION(session_gc) Write session data and end session */ static PHP_FUNCTION(session_write_close) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (PS(session_status) != php_session_active) { RETURN_FALSE; @@ -2500,9 +2488,7 @@ static PHP_FUNCTION(session_write_close) Abort session and end session. Session data will not be written */ static PHP_FUNCTION(session_abort) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (PS(session_status) != php_session_active) { RETURN_FALSE; @@ -2516,9 +2502,7 @@ static PHP_FUNCTION(session_abort) Reset session data from saved session data */ static PHP_FUNCTION(session_reset) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (PS(session_status) != php_session_active) { RETURN_FALSE; @@ -2532,9 +2516,7 @@ static PHP_FUNCTION(session_reset) Returns the current session status */ static PHP_FUNCTION(session_status) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_LONG(PS(session_status)); } diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index d7a482a0555fa..b50c5b6c3276c 100644 --- a/ext/simplexml/simplexml.c +++ b/ext/simplexml/simplexml.c @@ -1988,9 +1988,7 @@ SXE_METHOD(count) zend_long count = 0; php_sxe_object *sxe = Z_SXEOBJ_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); php_sxe_count_elements_helper(sxe, &count); diff --git a/ext/simplexml/sxe.c b/ext/simplexml/sxe.c index 63d54aab1ac26..ee0cba5fa74ee 100644 --- a/ext/simplexml/sxe.c +++ b/ext/simplexml/sxe.c @@ -43,9 +43,7 @@ PHP_METHOD(ce_SimpleXMLIterator, rewind) { php_sxe_iterator iter; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); iter.sxe = Z_SXEOBJ_P(getThis()); ce_SimpleXMLElement->iterator_funcs.funcs->rewind((zend_object_iterator*)&iter); @@ -58,9 +56,7 @@ PHP_METHOD(ce_SimpleXMLIterator, valid) { php_sxe_object *sxe = Z_SXEOBJ_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_BOOL(!Z_ISUNDEF(sxe->iter.data)); } @@ -73,9 +69,7 @@ PHP_METHOD(ce_SimpleXMLIterator, current) php_sxe_object *sxe = Z_SXEOBJ_P(getThis()); zval *data; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (Z_ISUNDEF(sxe->iter.data)) { return; /* return NULL */ @@ -95,9 +89,7 @@ PHP_METHOD(ce_SimpleXMLIterator, key) php_sxe_object *intern; php_sxe_object *sxe = Z_SXEOBJ_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (Z_ISUNDEF(sxe->iter.data)) { RETURN_FALSE; @@ -119,9 +111,7 @@ PHP_METHOD(ce_SimpleXMLIterator, next) { php_sxe_iterator iter; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); iter.sxe = Z_SXEOBJ_P(getThis()); ce_SimpleXMLElement->iterator_funcs.funcs->move_forward((zend_object_iterator*)&iter); @@ -136,9 +126,7 @@ PHP_METHOD(ce_SimpleXMLIterator, hasChildren) php_sxe_object *child; xmlNodePtr node; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (Z_ISUNDEF(sxe->iter.data) || sxe->iter.type == SXE_ITER_ATTRLIST) { RETURN_FALSE; @@ -163,9 +151,7 @@ PHP_METHOD(ce_SimpleXMLIterator, getChildren) php_sxe_object *sxe = Z_SXEOBJ_P(getThis()); zval *data; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (Z_ISUNDEF(sxe->iter.data) || sxe->iter.type == SXE_ITER_ATTRLIST) { return; /* return NULL */ diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c index 59c820a8be822..7d0c1d05ee71b 100644 --- a/ext/snmp/snmp.c +++ b/ext/snmp/snmp.c @@ -1547,9 +1547,7 @@ PHP_FUNCTION(snmpset) Return the current status of quick_print */ PHP_FUNCTION(snmp_get_quick_print) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_BOOL(netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT)); } diff --git a/ext/soap/soap.c b/ext/soap/soap.c index 394a96b3920bb..31e78a05d98ea 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -930,9 +930,7 @@ PHP_METHOD(SoapFault, __toString) zend_string *faultcode_val, *faultstring_val, *file_val; zend_long line_val; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); this_ptr = getThis(); faultcode = zend_read_property(soap_fault_class_entry, this_ptr, "faultcode", sizeof("faultcode")-1, 1, &rv1); @@ -1353,9 +1351,7 @@ PHP_METHOD(SoapServer, getFunctions) SOAP_SERVER_BEGIN_CODE(); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); FETCH_THIS_SERVICE(service); @@ -2923,9 +2919,7 @@ PHP_METHOD(SoapClient, __getFunctions) FETCH_THIS_SDL(sdl); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (sdl) { smart_str buf = {0}; @@ -2950,9 +2944,7 @@ PHP_METHOD(SoapClient, __getTypes) FETCH_THIS_SDL(sdl); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (sdl) { sdlTypePtr type; @@ -2977,9 +2969,7 @@ PHP_METHOD(SoapClient, __getLastRequest) { zval *tmp; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if ((tmp = zend_hash_str_find(Z_OBJPROP_P(getThis()), "__last_request", sizeof("__last_request")-1)) != NULL && Z_TYPE_P(tmp) == IS_STRING) { @@ -2996,9 +2986,7 @@ PHP_METHOD(SoapClient, __getLastResponse) { zval *tmp; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if ((tmp = zend_hash_str_find(Z_OBJPROP_P(getThis()), "__last_response", sizeof("__last_response")-1)) != NULL && Z_TYPE_P(tmp) == IS_STRING) { @@ -3015,9 +3003,7 @@ PHP_METHOD(SoapClient, __getLastRequestHeaders) { zval *tmp; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if ((tmp = zend_hash_str_find(Z_OBJPROP_P(getThis()), "__last_request_headers", sizeof("__last_request_headers")-1)) != NULL && Z_TYPE_P(tmp) == IS_STRING) { @@ -3034,9 +3020,7 @@ PHP_METHOD(SoapClient, __getLastResponseHeaders) { zval *tmp; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if ((tmp = zend_hash_str_find(Z_OBJPROP_P(getThis()), "__last_response_headers", sizeof("__last_response_headers")-1)) != NULL && Z_TYPE_P(tmp) == IS_STRING) { @@ -3125,10 +3109,7 @@ PHP_METHOD(SoapClient, __getCookies) { zval *cookies; - if (zend_parse_parameters_none() == FAILURE) { - return; - } - + ZEND_PARSE_PARAMETERS_NONE(); if ((cookies = zend_hash_str_find(Z_OBJPROP_P(getThis()), "_cookies", sizeof("_cookies")-1)) != NULL && Z_TYPE_P(cookies) == IS_ARRAY) { diff --git a/ext/sodium/libsodium.c b/ext/sodium/libsodium.c index 5791bc5114c7b..2569053ddd9b2 100644 --- a/ext/sodium/libsodium.c +++ b/ext/sodium/libsodium.c @@ -1040,9 +1040,8 @@ PHP_FUNCTION(sodium_crypto_box_keypair) zend_string *keypair; size_t keypair_len; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + keypair_len = crypto_box_SECRETKEYBYTES + crypto_box_PUBLICKEYBYTES; keypair = zend_string_alloc(keypair_len, 0); if (crypto_box_keypair((unsigned char *) ZSTR_VAL(keypair) + @@ -1384,9 +1383,8 @@ PHP_FUNCTION(sodium_crypto_sign_keypair) zend_string *keypair; size_t keypair_len; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + keypair_len = crypto_sign_SECRETKEYBYTES + crypto_sign_PUBLICKEYBYTES; keypair = zend_string_alloc(keypair_len, 0); if (crypto_sign_keypair((unsigned char *) ZSTR_VAL(keypair) + @@ -2130,9 +2128,8 @@ PHP_FUNCTION(sodium_crypto_pwhash_scryptsalsa208sha256_str_verify) PHP_FUNCTION(sodium_crypto_aead_aes256gcm_is_available) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + #ifdef HAVE_AESGCM RETURN_BOOL(crypto_aead_aes256gcm_is_available()); #else @@ -2871,9 +2868,8 @@ PHP_FUNCTION(sodium_crypto_kx_keypair) unsigned char *pk; zend_string *keypair; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + keypair = zend_string_alloc(crypto_kx_SECRETKEYBYTES + crypto_kx_PUBLICKEYBYTES, 0); sk = (unsigned char *) ZSTR_VAL(keypair); pk = sk + crypto_kx_SECRETKEYBYTES; @@ -3183,9 +3179,8 @@ PHP_FUNCTION(sodium_crypto_aead_aes256gcm_keygen) { unsigned char key[crypto_aead_aes256gcm_KEYBYTES]; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + randombytes_buf(key, sizeof key); RETURN_STRINGL((const char *) key, sizeof key); } @@ -3195,9 +3190,8 @@ PHP_FUNCTION(sodium_crypto_aead_chacha20poly1305_keygen) { unsigned char key[crypto_aead_chacha20poly1305_KEYBYTES]; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + randombytes_buf(key, sizeof key); RETURN_STRINGL((const char *) key, sizeof key); } @@ -3206,9 +3200,8 @@ PHP_FUNCTION(sodium_crypto_aead_chacha20poly1305_ietf_keygen) { unsigned char key[crypto_aead_chacha20poly1305_IETF_KEYBYTES]; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + randombytes_buf(key, sizeof key); RETURN_STRINGL((const char *) key, sizeof key); } @@ -3218,9 +3211,8 @@ PHP_FUNCTION(sodium_crypto_aead_xchacha20poly1305_ietf_keygen) { unsigned char key[crypto_aead_xchacha20poly1305_IETF_KEYBYTES]; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + randombytes_buf(key, sizeof key); RETURN_STRINGL((const char *) key, sizeof key); } @@ -3230,9 +3222,8 @@ PHP_FUNCTION(sodium_crypto_auth_keygen) { unsigned char key[crypto_auth_KEYBYTES]; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + randombytes_buf(key, sizeof key); RETURN_STRINGL((const char *) key, sizeof key); } @@ -3241,9 +3232,8 @@ PHP_FUNCTION(sodium_crypto_generichash_keygen) { unsigned char key[crypto_generichash_KEYBYTES]; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + randombytes_buf(key, sizeof key); RETURN_STRINGL((const char *) key, sizeof key); } @@ -3252,9 +3242,8 @@ PHP_FUNCTION(sodium_crypto_kdf_keygen) { unsigned char key[crypto_kdf_KEYBYTES]; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + randombytes_buf(key, sizeof key); RETURN_STRINGL((const char *) key, sizeof key); } @@ -3263,9 +3252,8 @@ PHP_FUNCTION(sodium_crypto_secretbox_keygen) { unsigned char key[crypto_secretbox_KEYBYTES]; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + randombytes_buf(key, sizeof key); RETURN_STRINGL((const char *) key, sizeof key); } @@ -3274,9 +3262,8 @@ PHP_FUNCTION(sodium_crypto_shorthash_keygen) { unsigned char key[crypto_shorthash_KEYBYTES]; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + randombytes_buf(key, sizeof key); RETURN_STRINGL((const char *) key, sizeof key); } @@ -3285,9 +3272,8 @@ PHP_FUNCTION(sodium_crypto_stream_keygen) { unsigned char key[crypto_stream_KEYBYTES]; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + randombytes_buf(key, sizeof key); RETURN_STRINGL((const char *) key, sizeof key); } @@ -3503,9 +3489,8 @@ PHP_FUNCTION(sodium_crypto_secretstream_xchacha20poly1305_keygen) { unsigned char key[crypto_secretstream_xchacha20poly1305_KEYBYTES]; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + randombytes_buf(key, sizeof key); RETURN_STRINGL((const char *) key, sizeof key); } diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index 2ae1d0de9abc3..6befde8dac3e1 100644 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -739,9 +739,7 @@ PHP_FUNCTION(spl_autoload_functions) zend_function *fptr; autoload_func_info *alfi; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (!EG(autoload_func)) { if ((fptr = zend_hash_str_find_ptr(EG(function_table), ZEND_AUTOLOAD_FUNC_NAME, sizeof(ZEND_AUTOLOAD_FUNC_NAME) - 1))) { diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c index ad4d13815b090..a09f739522b25 100644 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@ -1270,9 +1270,7 @@ SPL_METHOD(Array, getIteratorClass) zval *object = getThis(); spl_array_object *intern = Z_SPLARRAY_P(object); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); zend_string_addref(intern->ce_get_iterator->name); RETURN_STR(intern->ce_get_iterator->name); @@ -1286,9 +1284,7 @@ SPL_METHOD(Array, getFlags) zval *object = getThis(); spl_array_object *intern = Z_SPLARRAY_P(object); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_LONG(intern->ar_flags & ~SPL_ARRAY_INT_MASK); } @@ -1339,9 +1335,7 @@ SPL_METHOD(Array, getIterator) spl_array_object *intern = Z_SPLARRAY_P(object); HashTable *aht = spl_array_get_hash_table(intern); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (!aht) { php_error_docref(NULL, E_NOTICE, "Array was modified outside object and is no longer an array"); @@ -1359,9 +1353,7 @@ SPL_METHOD(Array, rewind) zval *object = getThis(); spl_array_object *intern = Z_SPLARRAY_P(object); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); spl_array_rewind(intern); } @@ -1456,9 +1448,7 @@ SPL_METHOD(Array, count) zend_long count; spl_array_object *intern = Z_SPLARRAY_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); spl_array_object_count_elements_helper(intern, &count); @@ -1561,9 +1551,7 @@ SPL_METHOD(Array, current) zval *entry; HashTable *aht = spl_array_get_hash_table(intern); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (spl_array_object_verify_pos(intern, aht) == FAILURE) { return; @@ -1587,9 +1575,7 @@ SPL_METHOD(Array, current) Return current array key */ SPL_METHOD(Array, key) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); spl_array_iterator_key(getThis(), return_value); } /* }}} */ @@ -1615,9 +1601,7 @@ SPL_METHOD(Array, next) spl_array_object *intern = Z_SPLARRAY_P(object); HashTable *aht = spl_array_get_hash_table(intern); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (spl_array_object_verify_pos(intern, aht) == FAILURE) { return; @@ -1635,9 +1619,7 @@ SPL_METHOD(Array, valid) spl_array_object *intern = Z_SPLARRAY_P(object); HashTable *aht = spl_array_get_hash_table(intern); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (spl_array_object_verify_pos(intern, aht) == FAILURE) { RETURN_FALSE; @@ -1655,9 +1637,7 @@ SPL_METHOD(Array, hasChildren) spl_array_object *intern = Z_SPLARRAY_P(object); HashTable *aht = spl_array_get_hash_table(intern); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (spl_array_object_verify_pos(intern, aht) == FAILURE) { RETURN_FALSE; @@ -1684,9 +1664,7 @@ SPL_METHOD(Array, getChildren) spl_array_object *intern = Z_SPLARRAY_P(object); HashTable *aht = spl_array_get_hash_table(intern); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (spl_array_object_verify_pos(intern, aht) == FAILURE) { return; @@ -1728,9 +1706,7 @@ SPL_METHOD(Array, serialize) php_serialize_data_t var_hash; smart_str buf = {0}; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (!aht) { php_error_docref(NULL, E_NOTICE, "Array was modified outside object and is no longer an array"); diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index 56e51dfe5ba47..b85854cd70b9c 100644 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -764,9 +764,7 @@ SPL_METHOD(DirectoryIterator, rewind) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); intern->u.dir.index = 0; if (intern->u.dir.dirp) { @@ -782,9 +780,7 @@ SPL_METHOD(DirectoryIterator, key) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (intern->u.dir.dirp) { RETURN_LONG(intern->u.dir.index); @@ -798,9 +794,7 @@ SPL_METHOD(DirectoryIterator, key) Return this (needed for Iterator interface) */ SPL_METHOD(DirectoryIterator, current) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); ZVAL_OBJ(return_value, Z_OBJ_P(getThis())); Z_ADDREF_P(return_value); } @@ -813,9 +807,7 @@ SPL_METHOD(DirectoryIterator, next) spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(getThis()); int skip_dots = SPL_HAS_FLAG(intern->flags, SPL_FILE_DIR_SKIPDOTS); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); intern->u.dir.index++; do { @@ -866,9 +858,7 @@ SPL_METHOD(DirectoryIterator, valid) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_BOOL(intern->u.dir.entry.d_name[0] != '\0'); } @@ -882,9 +872,7 @@ SPL_METHOD(SplFileInfo, getPath) char *path; size_t path_len; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); path = spl_filesystem_object_get_path(intern, &path_len); RETURN_STRINGL(path, path_len); @@ -898,9 +886,7 @@ SPL_METHOD(SplFileInfo, getFilename) spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(getThis()); size_t path_len; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); spl_filesystem_object_get_path(intern, &path_len); @@ -918,9 +904,7 @@ SPL_METHOD(DirectoryIterator, getFilename) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_STRING(intern->u.dir.entry.d_name); } @@ -938,9 +922,7 @@ SPL_METHOD(SplFileInfo, getExtension) size_t idx; zend_string *ret; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); spl_filesystem_object_get_path(intern, &path_len); @@ -976,9 +958,7 @@ SPL_METHOD(DirectoryIterator, getExtension) size_t idx; zend_string *fname; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); fname = php_basename(intern->u.dir.entry.d_name, strlen(intern->u.dir.entry.d_name), NULL, 0); @@ -1048,9 +1028,8 @@ SPL_METHOD(SplFileInfo, getPathname) char *path; size_t path_len; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + path = spl_filesystem_object_get_pathname(intern, &path_len); if (path != NULL) { RETURN_STRINGL(path, path_len); @@ -1066,9 +1045,7 @@ SPL_METHOD(FilesystemIterator, key) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (SPL_FILE_DIR_KEY(intern, SPL_FILE_DIR_KEY_AS_FILENAME)) { RETURN_STRING(intern->u.dir.entry.d_name); @@ -1085,9 +1062,7 @@ SPL_METHOD(FilesystemIterator, current) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (SPL_FILE_DIR_CURRENT(intern, SPL_FILE_DIR_CURRENT_AS_PATHNAME)) { spl_filesystem_object_get_file_name(intern); @@ -1109,9 +1084,7 @@ SPL_METHOD(DirectoryIterator, isDot) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_BOOL(spl_filesystem_is_dot(intern->u.dir.entry.d_name)); } @@ -1146,9 +1119,7 @@ SPL_METHOD(SplFileInfo, func_name) \ { \ spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(getThis()); \ zend_error_handling error_handling; \ - if (zend_parse_parameters_none() == FAILURE) { \ - return; \ - } \ + ZEND_PARSE_PARAMETERS_NONE(); \ \ zend_replace_error_handling(EH_THROW, spl_ce_RuntimeException, &error_handling);\ spl_filesystem_object_get_file_name(intern); \ @@ -1241,9 +1212,7 @@ SPL_METHOD(SplFileInfo, getLinkTarget) char buff[MAXPATHLEN]; zend_error_handling error_handling; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); zend_replace_error_handling(EH_THROW, spl_ce_RuntimeException, &error_handling); @@ -1289,9 +1258,7 @@ SPL_METHOD(SplFileInfo, getRealPath) char *filename; zend_error_handling error_handling; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); zend_replace_error_handling(EH_THROW, spl_ce_RuntimeException, &error_handling); @@ -1435,9 +1402,7 @@ SPL_METHOD(FilesystemIterator, rewind) spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(getThis()); int skip_dots = SPL_HAS_FLAG(intern->flags, SPL_FILE_DIR_SKIPDOTS); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); intern->u.dir.index = 0; if (intern->u.dir.dirp) { @@ -1455,9 +1420,7 @@ SPL_METHOD(FilesystemIterator, getFlags) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_LONG(intern->flags & (SPL_FILE_DIR_KEY_MODE_MASK | SPL_FILE_DIR_CURRENT_MODE_MASK | SPL_FILE_DIR_OTHERS_MASK)); } /* }}} */ @@ -1511,9 +1474,7 @@ SPL_METHOD(RecursiveDirectoryIterator, getChildren) spl_filesystem_object *subdir; char slash = SPL_HAS_FLAG(intern->flags, SPL_FILE_DIR_UNIXPATHS) ? '/' : DEFAULT_SLASH; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); spl_filesystem_object_get_file_name(intern); @@ -1544,9 +1505,7 @@ SPL_METHOD(RecursiveDirectoryIterator, getSubPath) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (intern->u.dir.sub_path) { RETURN_STRINGL(intern->u.dir.sub_path, intern->u.dir.sub_path_len); @@ -1563,9 +1522,7 @@ SPL_METHOD(RecursiveDirectoryIterator, getSubPathname) spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(getThis()); char slash = SPL_HAS_FLAG(intern->flags, SPL_FILE_DIR_UNIXPATHS) ? '/' : DEFAULT_SLASH; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (intern->u.dir.sub_path) { RETURN_NEW_STR(strpprintf(0, "%s%c%s", intern->u.dir.sub_path, slash, intern->u.dir.entry.d_name)); @@ -1598,9 +1555,7 @@ SPL_METHOD(GlobIterator, count) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (intern->u.dir.dirp && php_stream_is(intern->u.dir.dirp ,&php_glob_stream_ops)) { RETURN_LONG(php_glob_stream_get_count(intern->u.dir.dirp, NULL)); @@ -2345,9 +2300,7 @@ SPL_METHOD(SplFileObject, rewind) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); spl_filesystem_file_rewind(getThis(), intern); } /* }}} */ @@ -2358,9 +2311,7 @@ SPL_METHOD(SplFileObject, eof) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if(!intern->u.file.stream) { zend_throw_exception_ex(spl_ce_RuntimeException, 0, "Object not initialized"); @@ -2376,9 +2327,7 @@ SPL_METHOD(SplFileObject, valid) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (SPL_HAS_FLAG(intern->flags, SPL_FILE_OBJECT_READ_AHEAD)) { RETURN_BOOL(intern->u.file.current_line || !Z_ISUNDEF(intern->u.file.current_zval)); @@ -2396,9 +2345,7 @@ SPL_METHOD(SplFileObject, fgets) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if(!intern->u.file.stream) { zend_throw_exception_ex(spl_ce_RuntimeException, 0, "Object not initialized"); @@ -2417,9 +2364,7 @@ SPL_METHOD(SplFileObject, current) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if(!intern->u.file.stream) { zend_throw_exception_ex(spl_ce_RuntimeException, 0, "Object not initialized"); @@ -2447,9 +2392,7 @@ SPL_METHOD(SplFileObject, key) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); /* Do not read the next line to support correct counting with fgetc() if (!intern->current_line) { @@ -2464,9 +2407,7 @@ SPL_METHOD(SplFileObject, next) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); spl_filesystem_file_free_line(intern); if (SPL_HAS_FLAG(intern->flags, SPL_FILE_OBJECT_READ_AHEAD)) { @@ -2492,9 +2433,7 @@ SPL_METHOD(SplFileObject, getFlags) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_LONG(intern->flags & SPL_FILE_OBJECT_MASK); } /* }}} */ @@ -2525,9 +2464,7 @@ SPL_METHOD(SplFileObject, getMaxLineLen) { spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_LONG((zend_long)intern->u.file.max_line_len); } /* }}} */ @@ -2536,9 +2473,7 @@ SPL_METHOD(SplFileObject, getMaxLineLen) Return false */ SPL_METHOD(SplFileObject, hasChildren) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_FALSE; } /* }}} */ @@ -2547,9 +2482,8 @@ SPL_METHOD(SplFileObject, hasChildren) Read NULL */ SPL_METHOD(SplFileObject, getChildren) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + /* return NULL */ } /* }}} */ diff --git a/ext/spl/spl_dllist.c b/ext/spl/spl_dllist.c index 03a4f4b5fede3..2e4c96c120ae7 100644 --- a/ext/spl/spl_dllist.c +++ b/ext/spl/spl_dllist.c @@ -600,9 +600,7 @@ SPL_METHOD(SplDoublyLinkedList, pop) { spl_dllist_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); intern = Z_SPLDLLIST_P(getThis()); spl_ptr_llist_pop(intern->llist, return_value); @@ -620,9 +618,7 @@ SPL_METHOD(SplDoublyLinkedList, shift) { spl_dllist_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); intern = Z_SPLDLLIST_P(getThis()); spl_ptr_llist_shift(intern->llist, return_value); @@ -641,9 +637,7 @@ SPL_METHOD(SplDoublyLinkedList, top) zval *value; spl_dllist_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); intern = Z_SPLDLLIST_P(getThis()); value = spl_ptr_llist_last(intern->llist); @@ -665,9 +659,7 @@ SPL_METHOD(SplDoublyLinkedList, bottom) zval *value; spl_dllist_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); intern = Z_SPLDLLIST_P(getThis()); value = spl_ptr_llist_first(intern->llist); @@ -689,9 +681,7 @@ SPL_METHOD(SplDoublyLinkedList, count) zend_long count; spl_dllist_object *intern = Z_SPLDLLIST_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); count = spl_ptr_llist_count(intern->llist); RETURN_LONG(count); @@ -704,9 +694,7 @@ SPL_METHOD(SplDoublyLinkedList, isEmpty) { zend_long count; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); spl_dllist_object_count_elements(getThis(), &count); RETURN_BOOL(count == 0); @@ -744,9 +732,7 @@ SPL_METHOD(SplDoublyLinkedList, getIteratorMode) { spl_dllist_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); intern = Z_SPLDLLIST_P(getThis()); @@ -1041,9 +1027,7 @@ SPL_METHOD(SplDoublyLinkedList, key) { spl_dllist_object *intern = Z_SPLDLLIST_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_LONG(intern->traverse_position); } @@ -1055,9 +1039,7 @@ SPL_METHOD(SplDoublyLinkedList, prev) { spl_dllist_object *intern = Z_SPLDLLIST_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); spl_dllist_it_helper_move_forward(&intern->traverse_pointer, &intern->traverse_position, intern->llist, intern->flags ^ SPL_DLLIST_IT_LIFO); } @@ -1069,9 +1051,7 @@ SPL_METHOD(SplDoublyLinkedList, next) { spl_dllist_object *intern = Z_SPLDLLIST_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); spl_dllist_it_helper_move_forward(&intern->traverse_pointer, &intern->traverse_position, intern->llist, intern->flags); } @@ -1083,9 +1063,7 @@ SPL_METHOD(SplDoublyLinkedList, valid) { spl_dllist_object *intern = Z_SPLDLLIST_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_BOOL(intern->traverse_pointer != NULL); } @@ -1097,9 +1075,7 @@ SPL_METHOD(SplDoublyLinkedList, rewind) { spl_dllist_object *intern = Z_SPLDLLIST_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); spl_dllist_it_helper_rewind(&intern->traverse_pointer, &intern->traverse_position, intern->llist, intern->flags); } @@ -1112,9 +1088,7 @@ SPL_METHOD(SplDoublyLinkedList, current) spl_dllist_object *intern = Z_SPLDLLIST_P(getThis()); spl_ptr_llist_element *element = intern->traverse_pointer; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (element == NULL || Z_ISUNDEF(element->data)) { RETURN_NULL(); @@ -1137,9 +1111,7 @@ SPL_METHOD(SplDoublyLinkedList, serialize) zval flags; php_serialize_data_t var_hash; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); PHP_VAR_SERIALIZE_INIT(var_hash); diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c index 104b3d071e6ab..71698e7e6e87e 100644 --- a/ext/spl/spl_fixedarray.c +++ b/ext/spl/spl_fixedarray.c @@ -582,9 +582,7 @@ SPL_METHOD(SplFixedArray, __wakeup) HashTable *intern_ht = zend_std_get_properties(getThis()); zval *data; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (intern->array.size == 0) { int index = 0; @@ -611,9 +609,7 @@ SPL_METHOD(SplFixedArray, count) zval *object = getThis(); spl_fixedarray_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); intern = Z_SPLFIXEDARRAY_P(object); RETURN_LONG(intern->array.size); @@ -626,9 +622,7 @@ SPL_METHOD(SplFixedArray, toArray) { spl_fixedarray_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); intern = Z_SPLFIXEDARRAY_P(getThis()); @@ -724,9 +718,7 @@ SPL_METHOD(SplFixedArray, getSize) zval *object = getThis(); spl_fixedarray_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); intern = Z_SPLFIXEDARRAY_P(object); RETURN_LONG(intern->array.size); @@ -918,9 +910,7 @@ SPL_METHOD(SplFixedArray, key) { spl_fixedarray_object *intern = Z_SPLFIXEDARRAY_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_LONG(intern->current); } @@ -932,9 +922,7 @@ SPL_METHOD(SplFixedArray, next) { spl_fixedarray_object *intern = Z_SPLFIXEDARRAY_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); intern->current++; } @@ -946,9 +934,7 @@ SPL_METHOD(SplFixedArray, valid) { spl_fixedarray_object *intern = Z_SPLFIXEDARRAY_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_BOOL(intern->current >= 0 && intern->current < intern->array.size); } @@ -960,9 +946,7 @@ SPL_METHOD(SplFixedArray, rewind) { spl_fixedarray_object *intern = Z_SPLFIXEDARRAY_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); intern->current = 0; } @@ -975,9 +959,7 @@ SPL_METHOD(SplFixedArray, current) zval zindex, *value; spl_fixedarray_object *intern = Z_SPLFIXEDARRAY_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); ZVAL_LONG(&zindex, intern->current); diff --git a/ext/spl/spl_heap.c b/ext/spl/spl_heap.c index 6429a892ead18..3026ab91c4199 100644 --- a/ext/spl/spl_heap.c +++ b/ext/spl/spl_heap.c @@ -547,9 +547,7 @@ SPL_METHOD(SplHeap, count) zend_long count; spl_heap_object *intern = Z_SPLHEAP_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); count = spl_ptr_heap_count(intern->heap); RETURN_LONG(count); @@ -562,9 +560,7 @@ SPL_METHOD(SplHeap, isEmpty) { spl_heap_object *intern = Z_SPLHEAP_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_BOOL(spl_ptr_heap_count(intern->heap) == 0); } @@ -601,9 +597,7 @@ SPL_METHOD(SplHeap, extract) { spl_heap_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); intern = Z_SPLHEAP_P(getThis()); @@ -659,9 +653,7 @@ SPL_METHOD(SplPriorityQueue, extract) zval value, *value_out; spl_heap_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); intern = Z_SPLHEAP_P(getThis()); @@ -698,9 +690,7 @@ SPL_METHOD(SplPriorityQueue, top) zval *value, *value_out; spl_heap_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); intern = Z_SPLHEAP_P(getThis()); @@ -754,9 +744,7 @@ SPL_METHOD(SplPriorityQueue, getExtractFlags) { spl_heap_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); intern = Z_SPLHEAP_P(getThis()); @@ -770,9 +758,7 @@ SPL_METHOD(SplHeap, recoverFromCorruption) { spl_heap_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); intern = Z_SPLHEAP_P(getThis()); @@ -788,9 +774,7 @@ SPL_METHOD(SplHeap, isCorrupted) { spl_heap_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); intern = Z_SPLHEAP_P(getThis()); @@ -819,9 +803,7 @@ SPL_METHOD(SplHeap, top) zval *value; spl_heap_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); intern = Z_SPLHEAP_P(getThis()); @@ -963,9 +945,7 @@ SPL_METHOD(SplHeap, key) { spl_heap_object *intern = Z_SPLHEAP_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_LONG(intern->heap->count - 1); } @@ -979,9 +959,7 @@ SPL_METHOD(SplHeap, next) zval elem; spl_ptr_heap_delete_top(intern->heap, &elem, getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); zval_ptr_dtor(&elem); } @@ -993,9 +971,7 @@ SPL_METHOD(SplHeap, valid) { spl_heap_object *intern = Z_SPLHEAP_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_BOOL(intern->heap->count != 0); } @@ -1005,9 +981,8 @@ SPL_METHOD(SplHeap, valid) Rewind the datastructure back to the start */ SPL_METHOD(SplHeap, rewind) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + /* do nothing, the iterator always points to the top element */ } /* }}} */ @@ -1019,9 +994,7 @@ SPL_METHOD(SplHeap, current) spl_heap_object *intern = Z_SPLHEAP_P(getThis()); zval *element = &intern->heap->elements[0]; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (!intern->heap->count || Z_ISUNDEF_P(element)) { RETURN_NULL(); @@ -1039,9 +1012,7 @@ SPL_METHOD(SplPriorityQueue, current) spl_heap_object *intern = Z_SPLHEAP_P(getThis()); zval *element = &intern->heap->elements[0]; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (!intern->heap->count || Z_ISUNDEF_P(element)) { RETURN_NULL(); @@ -1252,4 +1223,3 @@ PHP_MINIT_FUNCTION(spl_heap) /* {{{ */ * vim600: fdm=marker * vim: noet sw=4 ts=4 */ - diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index 2cf658af29272..ee66368f30e27 100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -616,9 +616,7 @@ SPL_METHOD(RecursiveIteratorIterator, rewind) { spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); spl_recursive_it_rewind_ex(object, getThis()); } /* }}} */ @@ -629,9 +627,7 @@ SPL_METHOD(RecursiveIteratorIterator, valid) { spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_BOOL(spl_recursive_it_valid_ex(object, getThis()) == SUCCESS); } /* }}} */ @@ -643,9 +639,7 @@ SPL_METHOD(RecursiveIteratorIterator, key) spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(getThis()); zend_object_iterator *iterator; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_SUB_ITERATOR(iterator, object); @@ -664,9 +658,7 @@ SPL_METHOD(RecursiveIteratorIterator, current) zend_object_iterator *iterator; zval *data; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_SUB_ITERATOR(iterator, object); @@ -683,9 +675,7 @@ SPL_METHOD(RecursiveIteratorIterator, next) { spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); spl_recursive_it_move_forward_ex(object, getThis()); } /* }}} */ @@ -696,9 +686,7 @@ SPL_METHOD(RecursiveIteratorIterator, getDepth) { spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_LONG(object->level); } /* }}} */ @@ -736,9 +724,7 @@ SPL_METHOD(RecursiveIteratorIterator, getInnerIterator) spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(getThis()); zval *zobject; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_SUB_ELEMENT_ADDR(zobject, object, zobject); @@ -750,9 +736,8 @@ SPL_METHOD(RecursiveIteratorIterator, getInnerIterator) Called when iteration begins (after first rewind() call) */ SPL_METHOD(RecursiveIteratorIterator, beginIteration) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + /* nothing to do */ } /* }}} */ @@ -760,9 +745,8 @@ SPL_METHOD(RecursiveIteratorIterator, beginIteration) Called when iteration ends (when valid() first returns false */ SPL_METHOD(RecursiveIteratorIterator, endIteration) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + /* nothing to do */ } /* }}} */ @@ -774,9 +758,7 @@ SPL_METHOD(RecursiveIteratorIterator, callHasChildren) zend_class_entry *ce; zval *zobject; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (!object->iterators) { RETURN_NULL(); @@ -803,9 +785,7 @@ SPL_METHOD(RecursiveIteratorIterator, callGetChildren) zend_class_entry *ce; zval *zobject; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_SUB_ELEMENT(ce, object, ce); @@ -824,9 +804,8 @@ SPL_METHOD(RecursiveIteratorIterator, callGetChildren) Called when recursing one level down */ SPL_METHOD(RecursiveIteratorIterator, beginChildren) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + /* nothing to do */ } /* }}} */ @@ -834,9 +813,8 @@ SPL_METHOD(RecursiveIteratorIterator, beginChildren) Called when end recursing one level */ SPL_METHOD(RecursiveIteratorIterator, endChildren) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + /* nothing to do */ } /* }}} */ @@ -844,9 +822,8 @@ SPL_METHOD(RecursiveIteratorIterator, endChildren) Called when the next element is available */ SPL_METHOD(RecursiveIteratorIterator, nextElement) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + /* nothing to do */ } /* }}} */ @@ -876,9 +853,7 @@ SPL_METHOD(RecursiveIteratorIterator, getMaxDepth) { spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (object->max_depth == -1) { RETURN_FALSE; @@ -1132,9 +1107,7 @@ SPL_METHOD(RecursiveTreeIterator, getPrefix) { spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if(!object->iterators) { zend_throw_exception_ex(spl_ce_LogicException, 0, @@ -1167,9 +1140,7 @@ SPL_METHOD(RecursiveTreeIterator, getEntry) { spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if(!object->iterators) { zend_throw_exception_ex(spl_ce_LogicException, 0, @@ -1186,9 +1157,7 @@ SPL_METHOD(RecursiveTreeIterator, getPostfix) { spl_recursive_it_object *object = Z_SPLRECURSIVE_IT_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if(!object->iterators) { zend_throw_exception_ex(spl_ce_LogicException, 0, @@ -1208,9 +1177,7 @@ SPL_METHOD(RecursiveTreeIterator, current) char *ptr; zend_string *str; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if(!object->iterators) { zend_throw_exception_ex(spl_ce_LogicException, 0, @@ -1272,9 +1239,7 @@ SPL_METHOD(RecursiveTreeIterator, key) char *ptr; zend_string *str; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_SUB_ITERATOR(iterator, object); @@ -1633,9 +1598,7 @@ SPL_METHOD(dual_it, getInnerIterator) { spl_dual_it_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -1737,9 +1700,7 @@ SPL_METHOD(dual_it, rewind) { spl_dual_it_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -1756,9 +1717,7 @@ SPL_METHOD(dual_it, valid) { spl_dual_it_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -1777,9 +1736,7 @@ SPL_METHOD(dual_it, key) { spl_dual_it_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -1804,9 +1761,7 @@ SPL_METHOD(dual_it, current) { spl_dual_it_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -1828,9 +1783,7 @@ SPL_METHOD(dual_it, next) { spl_dual_it_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -1877,9 +1830,7 @@ SPL_METHOD(FilterIterator, rewind) { spl_dual_it_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); spl_filter_it_rewind(getThis(), intern); @@ -1891,9 +1842,7 @@ SPL_METHOD(FilterIterator, next) { spl_dual_it_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); spl_filter_it_next(getThis(), intern); @@ -1921,9 +1870,7 @@ SPL_METHOD(RecursiveFilterIterator, hasChildren) spl_dual_it_object *intern; zval retval; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -1942,9 +1889,7 @@ SPL_METHOD(RecursiveFilterIterator, getChildren) spl_dual_it_object *intern; zval retval; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -1962,9 +1907,7 @@ SPL_METHOD(RecursiveCallbackFilterIterator, getChildren) spl_dual_it_object *intern; zval retval; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -1998,9 +1941,7 @@ SPL_METHOD(CallbackFilterIterator, accept) zend_fcall_info_cache *fcc = &intern->u.cbfilter->fcc; zval params[3]; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (Z_TYPE(intern->current.data) == IS_UNDEF || Z_TYPE(intern->current.key) == IS_UNDEF) { RETURN_FALSE; @@ -2041,9 +1982,7 @@ SPL_METHOD(RegexIterator, accept) pcre2_code *re; int rc; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -2126,9 +2065,7 @@ SPL_METHOD(RegexIterator, getRegex) { spl_dual_it_object *intern = Z_SPLDUAL_IT_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_STR_COPY(intern->u.regex.regex); } /* }}} */ @@ -2139,9 +2076,7 @@ SPL_METHOD(RegexIterator, getMode) { spl_dual_it_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -2175,9 +2110,7 @@ SPL_METHOD(RegexIterator, getFlags) { spl_dual_it_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -2206,9 +2139,7 @@ SPL_METHOD(RegexIterator, getPregFlags) { spl_dual_it_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -2250,9 +2181,7 @@ SPL_METHOD(RecursiveRegexIterator, getChildren) spl_dual_it_object *intern; zval retval; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -2278,9 +2207,7 @@ SPL_METHOD(RecursiveRegexIterator, accept) { spl_dual_it_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -2735,9 +2662,7 @@ SPL_METHOD(CachingIterator, rewind) { spl_dual_it_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -2750,9 +2675,7 @@ SPL_METHOD(CachingIterator, valid) { spl_dual_it_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -2765,9 +2688,7 @@ SPL_METHOD(CachingIterator, next) { spl_dual_it_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -2780,9 +2701,7 @@ SPL_METHOD(CachingIterator, hasNext) { spl_dual_it_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -2920,9 +2839,7 @@ SPL_METHOD(CachingIterator, getCache) { spl_dual_it_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -2941,9 +2858,7 @@ SPL_METHOD(CachingIterator, getFlags) { spl_dual_it_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -2990,9 +2905,7 @@ SPL_METHOD(CachingIterator, count) { spl_dual_it_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -3057,9 +2970,7 @@ SPL_METHOD(RecursiveCachingIterator, hasChildren) { spl_dual_it_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -3072,9 +2983,7 @@ SPL_METHOD(RecursiveCachingIterator, getChildren) { spl_dual_it_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -3133,9 +3042,8 @@ SPL_METHOD(NoRewindIterator, __construct) Prevent a call to inner iterators rewind() */ SPL_METHOD(NoRewindIterator, rewind) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + /* nothing to do */ } /* }}} */ @@ -3145,9 +3053,7 @@ SPL_METHOD(NoRewindIterator, valid) { spl_dual_it_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); RETURN_BOOL(intern->inner.iterator->funcs->valid(intern->inner.iterator) == SUCCESS); @@ -3159,9 +3065,7 @@ SPL_METHOD(NoRewindIterator, key) { spl_dual_it_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -3179,9 +3083,7 @@ SPL_METHOD(NoRewindIterator, current) spl_dual_it_object *intern; zval *data; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); data = intern->inner.iterator->funcs->get_current_data(intern->inner.iterator); @@ -3197,9 +3099,7 @@ SPL_METHOD(NoRewindIterator, next) { spl_dual_it_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); intern->inner.iterator->funcs->move_forward(intern->inner.iterator); @@ -3233,9 +3133,7 @@ SPL_METHOD(InfiniteIterator, next) { spl_dual_it_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -3260,18 +3158,15 @@ static const zend_function_entry spl_funcs_InfiniteIterator[] = { Does nothing */ SPL_METHOD(EmptyIterator, rewind) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); } /* }}} */ /* {{{ proto false EmptyIterator::valid() Return false */ SPL_METHOD(EmptyIterator, valid) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + RETURN_FALSE; } /* }}} */ @@ -3279,9 +3174,8 @@ SPL_METHOD(EmptyIterator, valid) Throws exception BadMethodCallException */ SPL_METHOD(EmptyIterator, key) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + zend_throw_exception(spl_ce_BadMethodCallException, "Accessing the key of an EmptyIterator", 0); } /* }}} */ @@ -3289,9 +3183,8 @@ SPL_METHOD(EmptyIterator, key) Throws exception BadMethodCallException */ SPL_METHOD(EmptyIterator, current) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + zend_throw_exception(spl_ce_BadMethodCallException, "Accessing the value of an EmptyIterator", 0); } /* }}} */ @@ -3299,9 +3192,7 @@ SPL_METHOD(EmptyIterator, current) Does nothing */ SPL_METHOD(EmptyIterator, next) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); } /* }}} */ static const zend_function_entry spl_funcs_EmptyIterator[] = { @@ -3402,9 +3293,7 @@ SPL_METHOD(AppendIterator, current) { spl_dual_it_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -3425,9 +3314,7 @@ SPL_METHOD(AppendIterator, rewind) { spl_dual_it_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -3443,9 +3330,7 @@ SPL_METHOD(AppendIterator, valid) { spl_dual_it_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -3458,9 +3343,7 @@ SPL_METHOD(AppendIterator, next) { spl_dual_it_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -3473,9 +3356,7 @@ SPL_METHOD(AppendIterator, getIteratorIndex) { spl_dual_it_object *intern; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); @@ -3490,9 +3371,7 @@ SPL_METHOD(AppendIterator, getArrayIterator) spl_dual_it_object *intern; zval *value; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis()); diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c index 1c3911a25e5e0..42df77d5a56cb 100644 --- a/ext/spl/spl_observer.c +++ b/ext/spl/spl_observer.c @@ -590,9 +590,7 @@ SPL_METHOD(SplObjectStorage, rewind) { spl_SplObjectStorage *intern = Z_SPLOBJSTORAGE_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); zend_hash_internal_pointer_reset_ex(&intern->storage, &intern->pos); intern->index = 0; @@ -604,9 +602,7 @@ SPL_METHOD(SplObjectStorage, valid) { spl_SplObjectStorage *intern = Z_SPLOBJSTORAGE_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_BOOL(zend_hash_has_more_elements_ex(&intern->storage, &intern->pos) == SUCCESS); } /* }}} */ @@ -617,9 +613,7 @@ SPL_METHOD(SplObjectStorage, key) { spl_SplObjectStorage *intern = Z_SPLOBJSTORAGE_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_LONG(intern->index); } /* }}} */ @@ -631,9 +625,7 @@ SPL_METHOD(SplObjectStorage, current) spl_SplObjectStorageElement *element; spl_SplObjectStorage *intern = Z_SPLOBJSTORAGE_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if ((element = zend_hash_get_current_data_ptr_ex(&intern->storage, &intern->pos)) == NULL) { return; @@ -648,9 +640,7 @@ SPL_METHOD(SplObjectStorage, getInfo) spl_SplObjectStorageElement *element; spl_SplObjectStorage *intern = Z_SPLOBJSTORAGE_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if ((element = zend_hash_get_current_data_ptr_ex(&intern->storage, &intern->pos)) == NULL) { return; @@ -683,9 +673,7 @@ SPL_METHOD(SplObjectStorage, next) { spl_SplObjectStorage *intern = Z_SPLOBJSTORAGE_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); zend_hash_move_forward_ex(&intern->storage, &intern->pos); intern->index++; @@ -703,9 +691,7 @@ SPL_METHOD(SplObjectStorage, serialize) php_serialize_data_t var_hash; smart_str buf = {0}; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); PHP_VAR_SERIALIZE_INIT(var_hash); @@ -961,9 +947,8 @@ SPL_METHOD(MultipleIterator, getFlags) { spl_SplObjectStorage *intern = Z_SPLOBJSTORAGE_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + RETURN_LONG(intern->flags); } /* }}} */ @@ -1026,9 +1011,7 @@ SPL_METHOD(MultipleIterator, rewind) intern = Z_SPLOBJSTORAGE_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); zend_hash_internal_pointer_reset_ex(&intern->storage, &intern->pos); while ((element = zend_hash_get_current_data_ptr_ex(&intern->storage, &intern->pos)) != NULL && !EG(exception)) { @@ -1049,9 +1032,7 @@ SPL_METHOD(MultipleIterator, next) intern = Z_SPLOBJSTORAGE_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); zend_hash_internal_pointer_reset_ex(&intern->storage, &intern->pos); while ((element = zend_hash_get_current_data_ptr_ex(&intern->storage, &intern->pos)) != NULL && !EG(exception)) { @@ -1073,9 +1054,7 @@ SPL_METHOD(MultipleIterator, valid) intern = Z_SPLOBJSTORAGE_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (!zend_hash_num_elements(&intern->storage)) { RETURN_FALSE; @@ -1181,9 +1160,7 @@ SPL_METHOD(MultipleIterator, current) spl_SplObjectStorage *intern; intern = Z_SPLOBJSTORAGE_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); spl_multiple_iterator_get_all(intern, SPL_MULTIPLE_ITERATOR_GET_ALL_CURRENT, return_value); } @@ -1196,9 +1173,7 @@ SPL_METHOD(MultipleIterator, key) spl_SplObjectStorage *intern; intern = Z_SPLOBJSTORAGE_P(getThis()); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); spl_multiple_iterator_get_all(intern, SPL_MULTIPLE_ITERATOR_GET_ALL_KEY, return_value); } diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index eb87a5eef15c7..ff7146670aee9 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -181,9 +181,7 @@ PHP_METHOD(sqlite3, close) int errcode; db_obj = Z_SQLITE3_DB_P(object); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (db_obj->initialised) { zend_llist_clean(&(db_obj->free_list)); @@ -231,9 +229,7 @@ PHP_METHOD(sqlite3, exec) Returns the SQLite3 Library version as a string constant and as a number. */ PHP_METHOD(sqlite3, version) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); array_init(return_value); @@ -254,9 +250,7 @@ PHP_METHOD(sqlite3, lastInsertRowID) SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3) - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_LONG((zend_long) sqlite3_last_insert_rowid(db_obj->db)); } @@ -272,9 +266,7 @@ PHP_METHOD(sqlite3, lastErrorCode) SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->db, SQLite3) - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (db_obj->initialised) { RETURN_LONG(sqlite3_errcode(db_obj->db)); @@ -294,9 +286,7 @@ PHP_METHOD(sqlite3, lastErrorMsg) SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->db, SQLite3) - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (db_obj->initialised) { RETURN_STRING((char *)sqlite3_errmsg(db_obj->db)); @@ -423,9 +413,7 @@ PHP_METHOD(sqlite3, changes) SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3) - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_LONG(sqlite3_changes(db_obj->db)); } @@ -1291,9 +1279,7 @@ PHP_METHOD(sqlite3stmt, paramCount) zval *object = getThis(); stmt_obj = Z_SQLITE3_STMT_P(object); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SQLITE3_CHECK_INITIALIZED(stmt_obj->db_obj, stmt_obj->initialised, SQLite3); SQLITE3_CHECK_INITIALIZED_STMT(stmt_obj->stmt, SQLite3Stmt); @@ -1310,9 +1296,7 @@ PHP_METHOD(sqlite3stmt, close) zval *object = getThis(); stmt_obj = Z_SQLITE3_STMT_P(object); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SQLITE3_CHECK_INITIALIZED(stmt_obj->db_obj, stmt_obj->initialised, SQLite3); @@ -1332,9 +1316,7 @@ PHP_METHOD(sqlite3stmt, reset) zval *object = getThis(); stmt_obj = Z_SQLITE3_STMT_P(object); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SQLITE3_CHECK_INITIALIZED(stmt_obj->db_obj, stmt_obj->initialised, SQLite3); SQLITE3_CHECK_INITIALIZED_STMT(stmt_obj->stmt, SQLite3Stmt); @@ -1355,9 +1337,7 @@ PHP_METHOD(sqlite3stmt, clear) zval *object = getThis(); stmt_obj = Z_SQLITE3_STMT_P(object); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SQLITE3_CHECK_INITIALIZED(stmt_obj->db_obj, stmt_obj->initialised, SQLite3); SQLITE3_CHECK_INITIALIZED_STMT(stmt_obj->stmt, SQLite3Stmt); @@ -1385,9 +1365,7 @@ PHP_METHOD(sqlite3stmt, readOnly) zval *object = getThis(); stmt_obj = Z_SQLITE3_STMT_P(object); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SQLITE3_CHECK_INITIALIZED(stmt_obj->db_obj, stmt_obj->initialised, SQLite3); SQLITE3_CHECK_INITIALIZED_STMT(stmt_obj->stmt, SQLite3Stmt); @@ -1560,9 +1538,7 @@ PHP_METHOD(sqlite3stmt, execute) stmt_obj = Z_SQLITE3_STMT_P(object); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); SQLITE3_CHECK_INITIALIZED(stmt_obj->db_obj, stmt_obj->initialised, SQLite3); @@ -1728,9 +1704,7 @@ PHP_METHOD(sqlite3result, numColumns) SQLITE3_CHECK_INITIALIZED(result_obj->db_obj, result_obj->stmt_obj->initialised, SQLite3Result) - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_LONG(sqlite3_column_count(result_obj->stmt_obj->stmt)); } @@ -1851,9 +1825,7 @@ PHP_METHOD(sqlite3result, reset) SQLITE3_CHECK_INITIALIZED(result_obj->db_obj, result_obj->stmt_obj->initialised, SQLite3Result) - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (sqlite3_reset(result_obj->stmt_obj->stmt) != SQLITE_OK) { RETURN_FALSE; @@ -1875,9 +1847,7 @@ PHP_METHOD(sqlite3result, finalize) SQLITE3_CHECK_INITIALIZED(result_obj->db_obj, result_obj->stmt_obj->initialised, SQLite3Result) - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); /* We need to finalize an internal statement */ if (result_obj->is_prepared_statement == 0) { diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 85aa81f873c89..c209a3eb601e4 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -4534,9 +4534,7 @@ PHP_FUNCTION(getopt) Flush the output buffer */ PHP_FUNCTION(flush) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); sapi_flush(); } @@ -4671,9 +4669,7 @@ PHP_FUNCTION(time_sleep_until) Get the name of the owner of the current PHP script */ PHP_FUNCTION(get_current_user) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_STRING(php_get_current_user()); } @@ -4733,9 +4729,8 @@ PHP_FUNCTION(get_cfg_var) Get the current active configuration setting of magic_quotes_runtime */ PHP_FUNCTION(get_magic_quotes_runtime) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + RETURN_FALSE; } /* }}} */ @@ -4744,9 +4739,8 @@ PHP_FUNCTION(get_magic_quotes_runtime) Get the current active configuration setting of magic_quotes_gpc */ PHP_FUNCTION(get_magic_quotes_gpc) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + RETURN_FALSE; } /* }}} */ @@ -4851,9 +4845,7 @@ PHPAPI int _php_error_log_ex(int opt_err, char *message, size_t message_len, cha Get the last occurred error as associative array. Returns NULL if there hasn't been an error yet. */ PHP_FUNCTION(error_get_last) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (PG(last_error_message)) { array_init(return_value); @@ -4869,9 +4861,7 @@ PHP_FUNCTION(error_get_last) Clear the last occurred error. */ PHP_FUNCTION(error_clear_last) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (PG(last_error_message)) { PG(last_error_type) = 0; @@ -5593,9 +5583,7 @@ PHP_FUNCTION(get_include_path) { char *str; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); str = zend_ini_string("include_path", sizeof("include_path") - 1, 0); @@ -5613,9 +5601,8 @@ PHP_FUNCTION(restore_include_path) { zend_string *key; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + key = zend_string_init("include_path", sizeof("include_path")-1, 0); zend_restore_ini_entry(key, PHP_INI_STAGE_RUNTIME); zend_string_efree(key); @@ -6144,9 +6131,7 @@ PHP_FUNCTION(sys_getloadavg) { double load[3]; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (getloadavg(load, 3) == -1) { RETURN_FALSE; diff --git a/ext/standard/dir.c b/ext/standard/dir.c index f93fb0dbb584f..0544931da0c24 100644 --- a/ext/standard/dir.c +++ b/ext/standard/dir.c @@ -360,9 +360,7 @@ PHP_FUNCTION(getcwd) char path[MAXPATHLEN]; char *ret=NULL; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); #if HAVE_GETCWD ret = VCWD_GETCWD(path, MAXPATHLEN); diff --git a/ext/standard/dns.c b/ext/standard/dns.c index 614bc32119015..713508eed0ab4 100644 --- a/ext/standard/dns.c +++ b/ext/standard/dns.c @@ -128,9 +128,7 @@ PHP_FUNCTION(gethostname) { char buf[HOST_NAME_MAX + 1]; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (gethostname(buf, sizeof(buf))) { php_error_docref(NULL, E_WARNING, "unable to fetch host [%d]: %s", errno, strerror(errno)); diff --git a/ext/standard/file.c b/ext/standard/file.c index 096d70e12c808..e80305dba90ff 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -853,9 +853,7 @@ PHP_NAMED_FUNCTION(php_if_tmpfile) { php_stream *stream; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); stream = php_stream_fopen_tmpfile(); @@ -2519,9 +2517,8 @@ PHP_FUNCTION(fnmatch) Returns directory path used for temporary files */ PHP_FUNCTION(sys_get_temp_dir) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + RETURN_STRING((char *)php_get_temporary_directory()); } /* }}} */ diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c index a15f3287c25ba..cd98f478fa127 100644 --- a/ext/standard/filestat.c +++ b/ext/standard/filestat.c @@ -1102,9 +1102,8 @@ FileFunction(php_if_stat, FS_STAT) Get current size of realpath cache */ PHP_FUNCTION(realpath_cache_size) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + RETURN_LONG(realpath_cache_size()); } @@ -1114,9 +1113,7 @@ PHP_FUNCTION(realpath_cache_get) { realpath_cache_bucket **buckets = realpath_cache_get_buckets(), **end = buckets + realpath_cache_max_buckets(); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); array_init(return_value); while(buckets < end) { diff --git a/ext/standard/head.c b/ext/standard/head.c index 5e21638adf9dd..f3eb03c72fc26 100644 --- a/ext/standard/head.c +++ b/ext/standard/head.c @@ -314,9 +314,7 @@ static void php_head_apply_header_list_to_hash(void *data, void *arg) Return list of headers to be sent / already sent */ PHP_FUNCTION(headers_list) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); array_init(return_value); zend_llist_apply_with_argument(&SG(sapi_headers).headers, php_head_apply_header_list_to_hash, return_value); diff --git a/ext/standard/info.c b/ext/standard/info.c index 5c5892e6b638d..f32926b627433 100644 --- a/ext/standard/info.c +++ b/ext/standard/info.c @@ -1322,9 +1322,7 @@ PHP_FUNCTION(phpcredits) Return the current SAPI module name */ PHP_FUNCTION(php_sapi_name) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (sapi_module.name) { RETURN_STRING(sapi_module.name); @@ -1356,9 +1354,7 @@ PHP_FUNCTION(php_uname) Return comma-separated string of .ini files parsed from the additional ini dir */ PHP_FUNCTION(php_ini_scanned_files) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (php_ini_scanned_files) { RETURN_STRING(php_ini_scanned_files); @@ -1372,9 +1368,7 @@ PHP_FUNCTION(php_ini_scanned_files) Return the actual loaded ini filename */ PHP_FUNCTION(php_ini_loaded_file) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (php_ini_opened_path) { RETURN_STRING(php_ini_opened_path); diff --git a/ext/standard/lcg.c b/ext/standard/lcg.c index 7a16544bbea34..5788f58d64fea 100644 --- a/ext/standard/lcg.c +++ b/ext/standard/lcg.c @@ -118,9 +118,8 @@ PHP_MINIT_FUNCTION(lcg) /* {{{ */ Returns a value from the combined linear congruential generator */ PHP_FUNCTION(lcg_value) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + RETURN_DOUBLE(php_combined_lcg()); } /* }}} */ diff --git a/ext/standard/mt_rand.c b/ext/standard/mt_rand.c index 461373d76bb8b..2392e8501e72d 100644 --- a/ext/standard/mt_rand.c +++ b/ext/standard/mt_rand.c @@ -340,9 +340,7 @@ PHP_FUNCTION(mt_rand) Returns the maximum value a random number from Mersenne Twister can have */ PHP_FUNCTION(mt_getrandmax) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); /* * Melo: it could be 2^^32 but we only use 2^^31 to maintain @@ -368,4 +366,3 @@ PHP_MINIT_FUNCTION(mt_rand) * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ - diff --git a/ext/standard/pageinfo.c b/ext/standard/pageinfo.c index c23166999b9ff..39f1d27d3ae55 100644 --- a/ext/standard/pageinfo.c +++ b/ext/standard/pageinfo.c @@ -98,9 +98,7 @@ PHP_FUNCTION(getmyuid) { zend_long uid; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); uid = php_getuid(); if (uid < 0) { @@ -117,9 +115,7 @@ PHP_FUNCTION(getmygid) { zend_long gid; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); gid = php_getgid(); if (gid < 0) { @@ -136,9 +132,7 @@ PHP_FUNCTION(getmypid) { zend_long pid; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); pid = getpid(); if (pid < 0) { @@ -153,9 +147,7 @@ PHP_FUNCTION(getmypid) Get the inode of the current script being parsed */ PHP_FUNCTION(getmyinode) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); php_statpage(); if (BG(page_inode) < 0) { @@ -178,9 +170,7 @@ PHP_FUNCTION(getlastmod) { zend_long lm; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); lm = php_getlastmod(); if (lm < 0) { diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index d3f0c1cd7c8e7..0de796d52a21c 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -574,9 +574,7 @@ PHP_FUNCTION(stream_get_transports) HashTable *stream_xport_hash; zend_string *stream_xport; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if ((stream_xport_hash = php_stream_xport_get_hash())) { array_init(return_value); @@ -596,9 +594,7 @@ PHP_FUNCTION(stream_get_wrappers) HashTable *url_stream_wrappers_hash; zend_string *stream_protocol; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if ((url_stream_wrappers_hash = php_stream_get_url_stream_wrappers_hash())) { array_init(return_value); diff --git a/ext/standard/string.c b/ext/standard/string.c index f43d44929bb53..691fa1b8870ae 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -5492,9 +5492,7 @@ PHP_FUNCTION(localeconv) int len, i; /* We don't need no stinkin' parameters... */ - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); array_init(return_value); array_init(&grouping); diff --git a/ext/standard/syslog.c b/ext/standard/syslog.c index 912ebf4cba0a1..c71d5e615ec78 100644 --- a/ext/standard/syslog.c +++ b/ext/standard/syslog.c @@ -160,9 +160,7 @@ PHP_FUNCTION(openlog) Close connection to system logger */ PHP_FUNCTION(closelog) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); closelog(); if (BG(syslog_device)) { diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c index 01bc6e4021da8..447071a2cc46f 100644 --- a/ext/standard/user_filters.c +++ b/ext/standard/user_filters.c @@ -535,9 +535,7 @@ PHP_FUNCTION(stream_get_filters) zend_string *filter_name; HashTable *filters_hash; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); array_init(return_value); diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c index 61fd0f32cb7cc..c2a4360190484 100644 --- a/ext/tidy/tidy.c +++ b/ext/tidy/tidy.c @@ -58,9 +58,7 @@ PHPTidyObj *obj; \ TIDY_SET_CONTEXT; \ if (object) { \ - if (zend_parse_parameters_none() == FAILURE) { \ - return; \ - } \ + ZEND_PARSE_PARAMETERS_NONE(); \ } else { \ if (zend_parse_method_parameters(ZEND_NUM_ARGS(), NULL, "O", &object, tidy_ce_doc) == FAILURE) { \ RETURN_FALSE; \ @@ -71,9 +69,7 @@ #define TIDY_FETCH_ONLY_OBJECT \ PHPTidyObj *obj; \ TIDY_SET_CONTEXT; \ - if (zend_parse_parameters_none() == FAILURE) { \ - return; \ - } \ + ZEND_PARSE_PARAMETERS_NONE(); \ obj = Z_TIDY_P(object); \ #define TIDY_APPLY_CONFIG_ZVAL(_doc, _val) \ @@ -1370,9 +1366,7 @@ static PHP_FUNCTION(tidy_diagnose) Get release date (version) for Tidy library */ static PHP_FUNCTION(tidy_get_release) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); #if HAVE_TIDYRELEASEDATE RETURN_STRING((char *)tidyReleaseDate()); diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index 96c5e1137d468..89280b716d5ac 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -817,9 +817,7 @@ PHP_FUNCTION(xmlrpc_decode) Creates an xmlrpc server */ PHP_FUNCTION(xmlrpc_server_create) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (USED_RET()) { xmlrpc_server_data *server = emalloc(sizeof(xmlrpc_server_data)); @@ -1448,4 +1446,3 @@ PHP_FUNCTION(xmlrpc_is_fault) * c-basic-offset: 4 * End: */ - diff --git a/ext/xmlwriter/php_xmlwriter.c b/ext/xmlwriter/php_xmlwriter.c index 54480101b566c..4637d51ee08b4 100644 --- a/ext/xmlwriter/php_xmlwriter.c +++ b/ext/xmlwriter/php_xmlwriter.c @@ -741,9 +741,8 @@ static void php_xmlwriter_end(INTERNAL_FUNCTION_PARAMETERS, xmlwriter_read_int_t if (self) { XMLWRITER_FROM_OBJECT(intern, self); - if (zend_parse_parameters_none() == FAILURE) { - return; - } + + ZEND_PARSE_PARAMETERS_NONE(); } else { if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &pind) == FAILURE) { return; diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index dd38fa685783e..84f8420724607 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -544,9 +544,8 @@ static PHP_FUNCTION(ob_gzhandler) Returns the coding type used for output compression */ static PHP_FUNCTION(zlib_get_coding_type) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + switch (ZLIBG(compression_coding)) { case PHP_ZLIB_ENCODING_GZIP: RETURN_STRINGL("gzip", sizeof("gzip") - 1); diff --git a/main/output.c b/main/output.c index 74bc552dc642d..f3090fbdbb6d0 100644 --- a/main/output.c +++ b/main/output.c @@ -1335,9 +1335,7 @@ PHP_FUNCTION(ob_start) Flush (send) contents of the output buffer. The last buffer content is sent to next buffer */ PHP_FUNCTION(ob_flush) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (!OG(active)) { php_error_docref("ref.outcontrol", E_NOTICE, "failed to flush buffer. No buffer to flush"); @@ -1356,9 +1354,7 @@ PHP_FUNCTION(ob_flush) Clean (delete) the current output buffer */ PHP_FUNCTION(ob_clean) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (!OG(active)) { php_error_docref("ref.outcontrol", E_NOTICE, "failed to delete buffer. No buffer to delete"); @@ -1377,9 +1373,7 @@ PHP_FUNCTION(ob_clean) Flush (send) the output buffer, and delete current output buffer */ PHP_FUNCTION(ob_end_flush) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (!OG(active)) { php_error_docref("ref.outcontrol", E_NOTICE, "failed to delete and flush buffer. No buffer to delete or flush"); @@ -1394,9 +1388,7 @@ PHP_FUNCTION(ob_end_flush) Clean the output buffer, and delete current output buffer */ PHP_FUNCTION(ob_end_clean) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (!OG(active)) { php_error_docref("ref.outcontrol", E_NOTICE, "failed to delete buffer. No buffer to delete"); @@ -1411,9 +1403,7 @@ PHP_FUNCTION(ob_end_clean) Get current buffer contents, flush (send) the output buffer, and delete current output buffer */ PHP_FUNCTION(ob_get_flush) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (php_output_get_contents(return_value) == FAILURE) { php_error_docref("ref.outcontrol", E_NOTICE, "failed to delete and flush buffer. No buffer to delete or flush"); @@ -1430,9 +1420,7 @@ PHP_FUNCTION(ob_get_flush) Get current buffer contents and delete current output buffer */ PHP_FUNCTION(ob_get_clean) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if(!OG(active)) { RETURN_FALSE; @@ -1453,9 +1441,7 @@ PHP_FUNCTION(ob_get_clean) Return the contents of the output buffer */ PHP_FUNCTION(ob_get_contents) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (php_output_get_contents(return_value) == FAILURE) { RETURN_FALSE; @@ -1467,9 +1453,7 @@ PHP_FUNCTION(ob_get_contents) Return the nesting level of the output buffer */ PHP_FUNCTION(ob_get_level) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_LONG(php_output_get_level()); } @@ -1479,9 +1463,7 @@ PHP_FUNCTION(ob_get_level) Return the length of the output buffer */ PHP_FUNCTION(ob_get_length) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); if (php_output_get_length(return_value) == FAILURE) { RETURN_FALSE; @@ -1493,9 +1475,7 @@ PHP_FUNCTION(ob_get_length) List all output_buffers in an array */ PHP_FUNCTION(ob_list_handlers) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); array_init(return_value); diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c index eebc88567e8c0..5f212214eea60 100644 --- a/sapi/apache2handler/php_functions.c +++ b/sapi/apache2handler/php_functions.c @@ -176,9 +176,7 @@ PHP_FUNCTION(apache_request_headers) const apr_array_header_t *arr; char *key, *val; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); array_init(return_value); @@ -200,9 +198,7 @@ PHP_FUNCTION(apache_response_headers) const apr_array_header_t *arr; char *key, *val; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); array_init(return_value); diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 2e9cefedeaf6b..d8efcefe68464 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -1581,9 +1581,8 @@ static PHP_MINFO_FUNCTION(cgi) PHP_FUNCTION(apache_child_terminate) /* {{{ */ { - if (zend_parse_parameters_none()) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + if (fcgi_is_fastcgi()) { fcgi_terminate(); } @@ -1642,9 +1641,8 @@ static void add_request_header(char *var, unsigned int var_len, char *val, unsig PHP_FUNCTION(apache_request_headers) /* {{{ */ { - if (zend_parse_parameters_none()) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); + array_init(return_value); if (fcgi_is_fastcgi()) { fcgi_request *request = (fcgi_request*) SG(server_context); @@ -1755,9 +1753,7 @@ static void add_response_header(sapi_header_struct *h, zval *return_value) /* {{ PHP_FUNCTION(apache_response_headers) /* {{{ */ { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); array_init(return_value); zend_llist_apply_with_argument(&SG(sapi_headers).headers, (llist_apply_with_arg_func_t)add_response_header, return_value); diff --git a/sapi/cli/php_cli_process_title.c b/sapi/cli/php_cli_process_title.c index c1074ebf1977d..262e141bda120 100644 --- a/sapi/cli/php_cli_process_title.c +++ b/sapi/cli/php_cli_process_title.c @@ -56,9 +56,7 @@ PHP_FUNCTION(cli_get_process_title) const char* title = NULL; int rc; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); rc = get_ps_title(&length, &title); if (rc != PS_TITLE_SUCCESS) { diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 34cbf305eacd0..d1d837533b581 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -379,9 +379,7 @@ PHP_FUNCTION(apache_request_headers) /* {{{ */ char *value; zval tmp; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); client = SG(server_context); headers = &client->request.headers_original_case; @@ -425,9 +423,7 @@ static void add_response_header(sapi_header_struct *h, zval *return_value) /* {{ PHP_FUNCTION(apache_response_headers) /* {{{ */ { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); array_init(return_value); zend_llist_apply_with_argument(&SG(sapi_headers).headers, (llist_apply_with_arg_func_t)add_response_header, return_value); diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index a1fdc0cfe151c..e898d6f00f502 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -363,10 +363,12 @@ static PHP_FUNCTION(phpdbg_break_next) ex = ex->prev_execute_data; } - if (zend_parse_parameters_none() == FAILURE || !ex) { + if (!ex) { return; } + ZEND_PARSE_PARAMETERS_NONE(); + phpdbg_set_breakpoint_opline_ex((phpdbg_opline_ptr_t) ex->opline + 1); } /* }}} */ @@ -465,9 +467,7 @@ static PHP_FUNCTION(phpdbg_start_oplog) { phpdbg_oplog_list *prev; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); prev = PHPDBG_G(oplog_list); diff --git a/win32/codepage.c b/win32/codepage.c index 16e480e5fff5c..22b4a03d58a7e 100644 --- a/win32/codepage.c +++ b/win32/codepage.c @@ -177,7 +177,7 @@ PW32CP wchar_t *php_win32_cp_conv_ascii_to_w(const char* in, size_t in_len, size } ret_idx += 8; - { + { const __m128i hi = _mm_unpackhi_epi8(block, mask); _mm_storeu_si128((__m128i *)ret_idx, hi); } @@ -615,9 +615,7 @@ PHP_FUNCTION(sapi_windows_cp_get) * Indicates whether the codepage is UTF-8 compatible. */ PHP_FUNCTION(sapi_windows_cp_is_utf8) { - if (zend_parse_parameters_none() == FAILURE) { - return; - } + ZEND_PARSE_PARAMETERS_NONE(); RETURN_BOOL(php_win32_cp_use_unicode()); }