From 417dbfbacc3f115ac4d3449c1cf469b8c3da2e6a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rouven=20We=C3=9Fling?= Date: Sat, 28 Dec 2013 23:08:50 +0100 Subject: [PATCH] Declare a number of functions as variadic. --- ext/dba/dba.c | 4 +- ext/standard/basic_functions.c | 86 ++++++++++++---------------------- ext/wddx/wddx.c | 6 +-- 3 files changed, 33 insertions(+), 63 deletions(-) diff --git a/ext/dba/dba.c b/ext/dba/dba.c index 9df7f34001..3bb45aa561 100644 --- a/ext/dba/dba.c +++ b/ext/dba/dba.c @@ -57,14 +57,14 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_popen, 0, 0, 2) ZEND_ARG_INFO(0, path) ZEND_ARG_INFO(0, mode) ZEND_ARG_INFO(0, handlername) - ZEND_ARG_INFO(0, ...) + ZEND_ARG_VARIADIC_INFO(0, handler_parameters) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_open, 0, 0, 2) ZEND_ARG_INFO(0, path) ZEND_ARG_INFO(0, mode) ZEND_ARG_INFO(0, handlername) - ZEND_ARG_INFO(0, ...) + ZEND_ARG_VARIADIC_INFO(0, handler_parameters) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_dba_close, 0) diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 4f50ce6038..897b1a9e49 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -297,15 +297,11 @@ ZEND_BEGIN_ARG_INFO(arginfo_key, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_min, 0, 0, 1) - ZEND_ARG_INFO(0, arg1) - ZEND_ARG_INFO(0, arg2) - ZEND_ARG_INFO(0, ...) + ZEND_ARG_VARIADIC_INFO(0, args) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_max, 0, 0, 1) - ZEND_ARG_INFO(0, arg1) - ZEND_ARG_INFO(0, arg2) - ZEND_ARG_INFO(0, ...) + ZEND_ARG_VARIADIC_INFO(0, args) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_array_walk, 0, 0, 2) @@ -339,8 +335,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_extract, 0, 0, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_compact, 0, 0, 1) - ZEND_ARG_INFO(0, var_names) - ZEND_ARG_INFO(0, ...) + ZEND_ARG_VARIADIC_INFO(0, var_names) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_array_fill, 0) @@ -366,8 +361,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_array_push, 0, 0, 2) ZEND_ARG_INFO(1, stack) /* ARRAY_INFO(1, stack, 0) */ - ZEND_ARG_INFO(0, var) - ZEND_ARG_INFO(0, ...) + ZEND_ARG_VARIADIC_INFO(0, vars) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_array_pop, 0) @@ -380,8 +374,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_array_unshift, 0, 0, 2) ZEND_ARG_INFO(1, stack) /* ARRAY_INFO(1, stack, 0) */ - ZEND_ARG_INFO(0, var) - ZEND_ARG_INFO(0, ...) + ZEND_ARG_VARIADIC_INFO(0, vars) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_array_splice, 0, 0, 2) @@ -400,26 +393,22 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_array_merge, 0, 0, 2) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg, 0) */ - ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg, 0) */ - ZEND_ARG_INFO(0, ...) /* ARRAY_INFO(0, ..., 0) */ + ZEND_ARG_VARIADIC_INFO(0, arrays) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_array_merge_recursive, 0, 0, 2) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg, 0) */ - ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg, 0) */ - ZEND_ARG_INFO(0, ...) /* ARRAY_INFO(0, arg, 0) */ + ZEND_ARG_VARIADIC_INFO(0, arrays) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_array_replace, 0, 0, 2) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg, 0) */ - ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg, 0) */ - ZEND_ARG_INFO(0, ...) /* ARRAY_INFO(0, ..., 0) */ + ZEND_ARG_VARIADIC_INFO(0, arrays) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_array_replace_recursive, 0, 0, 2) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg, 0) */ - ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg, 0) */ - ZEND_ARG_INFO(0, ...) /* ARRAY_INFO(0, arg, 0) */ + ZEND_ARG_VARIADIC_INFO(0, arrays) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_array_keys, 0, 0, 1) @@ -468,8 +457,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_array_intersect_key, 0, 0, 2) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg1, 0) */ - ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg2, 0) */ - ZEND_ARG_INFO(0, ...) /* ARRAY_INFO(0, ..., 0) */ + ZEND_ARG_VARIADIC_INFO(0, arrays) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_array_intersect_ukey, 0) @@ -480,8 +468,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_array_intersect, 0, 0, 2) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg1, 0) */ - ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg2, 0) */ - ZEND_ARG_INFO(0, ...) /* ARRAY_INFO(0, ..., 0) */ + ZEND_ARG_VARIADIC_INFO(0, arrays) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_array_uintersect, 0) @@ -492,8 +479,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_array_intersect_assoc, 0, 0, 2) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg1, 0) */ - ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg2, 0) */ - ZEND_ARG_INFO(0, ...) /* ARRAY_INFO(0, ..., 0) */ + ZEND_ARG_VARIADIC_INFO(0, arrays) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_array_uintersect_assoc, 0) @@ -517,8 +503,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_array_diff_key, 0, 0, 2) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg1, 0) */ - ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg2, 0) */ - ZEND_ARG_INFO(0, ...) /* ARRAY_INFO(0, ..., 0) */ + ZEND_ARG_VARIADIC_INFO(0, arrays) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_array_diff_ukey, 0) @@ -529,8 +514,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_array_diff, 0, 0, 2) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg1, 0) */ - ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg2, 0) */ - ZEND_ARG_INFO(0, ...) /* ARRAY_INFO(0, ..., 0) */ + ZEND_ARG_VARIADIC_INFO(0, arrays) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_array_udiff, 0) @@ -541,8 +525,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_array_diff_assoc, 0, 0, 2) ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg1, 0) */ - ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg2, 0) */ - ZEND_ARG_INFO(0, ...) /* ARRAY_INFO(0, ..., 0) */ + ZEND_ARG_VARIADIC_INFO(0, arrays) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_array_diff_uassoc, 0) @@ -601,8 +584,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_array_map, 0, 0, 2) ZEND_ARG_INFO(0, callback) - ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */ - ZEND_ARG_INFO(0, ...) + ZEND_ARG_VARIADIC_INFO(0, arrays) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_array_key_exists, 0) @@ -712,8 +694,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_call_user_func, 0, 0, 1) ZEND_ARG_INFO(0, function_name) - ZEND_ARG_INFO(0, parmeter) - ZEND_ARG_INFO(0, ...) + ZEND_ARG_VARIADIC_INFO(0, parameters) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_call_user_func_array, 0, 0, 2) @@ -724,8 +705,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_call_user_method, 0, 0, 2) ZEND_ARG_INFO(0, method_name) ZEND_ARG_INFO(1, object) - ZEND_ARG_INFO(0, parameter) - ZEND_ARG_INFO(0, ...) + ZEND_ARG_VARIADIC_INFO(0, parameters) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_call_user_method_array, 0) @@ -736,8 +716,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_forward_static_call, 0, 0, 1) ZEND_ARG_INFO(0, function_name) - ZEND_ARG_INFO(0, parameter) - ZEND_ARG_INFO(0, ...) + ZEND_ARG_VARIADIC_INFO(0, parameters) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_forward_static_call_array, 0, 0, 2) @@ -745,8 +724,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_forward_static_call_array, 0, 0, 2) ZEND_ARG_INFO(0, parameters) /* ARRAY_INFO(0, parameters, 1) */ ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO(arginfo_register_shutdown_function, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_register_shutdown_function, 0, 0, 1) ZEND_ARG_INFO(0, function_name) + ZEND_ARG_VARIADIC_INFO(0, parameters) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_highlight_file, 0, 0, 1) @@ -833,8 +813,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_register_tick_function, 0, 0, 1) ZEND_ARG_INFO(0, function_name) - ZEND_ARG_INFO(0, arg) - ZEND_ARG_INFO(0, ...) + ZEND_ARG_VARIADIC_INFO(0, parameters) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_unregister_tick_function, 0) @@ -1391,8 +1370,7 @@ ZEND_END_ARG_INFO() /* {{{ formatted_print.c */ ZEND_BEGIN_ARG_INFO_EX(arginfo_sprintf, 0, 0, 2) ZEND_ARG_INFO(0, format) - ZEND_ARG_INFO(0, arg1) - ZEND_ARG_INFO(0, ...) + ZEND_ARG_VARIADIC_INFO(0, args) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_vsprintf, 0) @@ -1402,8 +1380,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_printf, 0, 0, 1) ZEND_ARG_INFO(0, format) - ZEND_ARG_INFO(0, arg1) - ZEND_ARG_INFO(0, ...) + ZEND_ARG_VARIADIC_INFO(0, args) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_vprintf, 0) @@ -1414,8 +1391,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_fprintf, 0, 0, 2) ZEND_ARG_INFO(0, stream) ZEND_ARG_INFO(0, format) - ZEND_ARG_INFO(0, arg1) - ZEND_ARG_INFO(0, ...) + ZEND_ARG_VARIADIC_INFO(0, args) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_vfprintf, 0) @@ -1837,8 +1813,7 @@ ZEND_END_ARG_INFO() /* {{{ pack.c */ ZEND_BEGIN_ARG_INFO_EX(arginfo_pack, 0, 0, 2) ZEND_ARG_INFO(0, format) - ZEND_ARG_INFO(0, arg1) - ZEND_ARG_INFO(0, ...) + ZEND_ARG_VARIADIC_INFO(0, args) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_unpack, 0) @@ -2399,8 +2374,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_setlocale, 0, 0, 2) ZEND_ARG_INFO(0, category) - ZEND_ARG_INFO(0, locale) - ZEND_ARG_INFO(0, ...) + ZEND_ARG_VARIADIC_INFO(0, locales) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_parse_str, 0, 0, 1) @@ -2661,13 +2635,11 @@ ZEND_END_ARG_INFO() /* }}} */ /* {{{ var.c */ ZEND_BEGIN_ARG_INFO_EX(arginfo_var_dump, 0, 0, 1) - ZEND_ARG_INFO(0, var) - ZEND_ARG_INFO(0, ...) + ZEND_ARG_VARIADIC_INFO(0, vars) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_debug_zval_dump, 0, 0, 1) - ZEND_ARG_INFO(0, var) - ZEND_ARG_INFO(0, ...) + ZEND_ARG_VARIADIC_INFO(0, vars) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_var_export, 0, 0, 1) diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c index bc0244e358..b65be31a80 100644 --- a/ext/wddx/wddx.c +++ b/ext/wddx/wddx.c @@ -109,8 +109,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_wddx_serialize_value, 0, 0, 1) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_wddx_serialize_vars, 0, 0, 1) - ZEND_ARG_INFO(0, var_name) - ZEND_ARG_INFO(0, ...) + ZEND_ARG_VARIADIC_INFO(0, var_names) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_wddx_serialize_start, 0, 0, 0) @@ -123,8 +122,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_wddx_add_vars, 0, 0, 2) ZEND_ARG_INFO(0, packet_id) - ZEND_ARG_INFO(0, var_name) - ZEND_ARG_INFO(0, ...) + ZEND_ARG_VARIADIC_INFO(0, var_names) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_wddx_deserialize, 0, 0, 1) -- 2.40.0