- Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 169b6ac5885c8bd7ba6d0e749b051d59ce461ff6..7708681a0192c9d4b395b4122292da0137b4e3a8 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -101,7 +101,7 @@ typedef struct _zend_fcall_info_cache {
 #define ZEND_ARG_OBJ_INFO(pass_by_ref, name, classname, allow_null) { {#name}, sizeof(#name)-1, {#classname}, sizeof(#classname)-1, 0, allow_null, pass_by_ref, 0, 0 },
 #define ZEND_ARG_ARRAY_INFO(pass_by_ref, name, allow_null) { {#name}, sizeof(#name)-1, {NULL}, 0, 1, allow_null, pass_by_ref, 0, 0 },
 #define ZEND_BEGIN_ARG_INFO_EX(name, pass_rest_by_reference, return_reference, required_num_args)      \
-       const zend_arg_info name[] = {                                                                                                                                          \
+       const static zend_arg_info name[] = {                                                                                                                                           \
                { {NULL}, 0, {NULL}, 0, 0, 0, pass_rest_by_reference, return_reference, required_num_args },
 #define ZEND_BEGIN_ARG_INFO(name, pass_rest_by_reference)      \
        ZEND_BEGIN_ARG_INFO_EX(name, pass_rest_by_reference, ZEND_RETURN_VALUE, -1)

diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 3857afdddc7493dc7750a35850d1d0670d09a1ab..caf550ac633b6c7a148c57cfcd042138ced81e50 100644 (file)
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -93,251 +93,202 @@ static ZEND_FUNCTION(gc_disable);
 /* }}} */
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_zend_version, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_func_num_args, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_func_get_arg, 0, 0, 1)
        ZEND_ARG_INFO(0, arg_num)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_func_get_args, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_strlen, 0, 0, 1)
        ZEND_ARG_INFO(0, str)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_strcmp, 0, 0, 2)
        ZEND_ARG_INFO(0, str1)
        ZEND_ARG_INFO(0, str2)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_strncmp, 0, 0, 3)
        ZEND_ARG_INFO(0, str1)
        ZEND_ARG_INFO(0, str2)
        ZEND_ARG_INFO(0, len)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_strcasecmp, 0, 0, 2)
        ZEND_ARG_INFO(0, str1)
        ZEND_ARG_INFO(0, str2)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_strncasecmp, 0, 0, 3)
        ZEND_ARG_INFO(0, str1)
        ZEND_ARG_INFO(0, str2)
        ZEND_ARG_INFO(0, len)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_each, 0, 0, 1)
        ZEND_ARG_INFO(1, arr)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_error_reporting, 0, 0, 1)
        ZEND_ARG_INFO(0, new_error_level)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_define, 0, 0, 3)
        ZEND_ARG_INFO(0, constant_name)
        ZEND_ARG_INFO(0, value)
        ZEND_ARG_INFO(0, case_sensitive)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_defined, 0, 0, 1)
        ZEND_ARG_INFO(0, constant_name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_get_class, 0, 0, 0)
        ZEND_ARG_INFO(0, object)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_get_called_class, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_get_parent_class, 0, 0, 0)
        ZEND_ARG_INFO(0, object)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_is_subclass_of, 0, 0, 2)
        ZEND_ARG_INFO(0, object)
        ZEND_ARG_INFO(0, class_name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_is_a, 0, 0, 2)
        ZEND_ARG_INFO(0, object)
        ZEND_ARG_INFO(0, class_name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_get_class_vars, 0, 0, 1)
        ZEND_ARG_INFO(0, class_name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_get_object_vars, 0, 0, 1)
        ZEND_ARG_INFO(0, obj)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_get_class_methods, 0, 0, 1)
        ZEND_ARG_INFO(0, class)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_method_exists, 0, 0, 2)
        ZEND_ARG_INFO(0, object)
        ZEND_ARG_INFO(0, method)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_property_exists, 0, 0, 2)
        ZEND_ARG_INFO(0, object_or_class)
        ZEND_ARG_INFO(0, property_name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_exists, 0, 0, 1)
        ZEND_ARG_INFO(0, classname)
        ZEND_ARG_INFO(0, autoload)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_interface_exists, 0, 0, 1)
        ZEND_ARG_INFO(0, classname)
        ZEND_ARG_INFO(0, autoload)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_function_exists, 0, 0, 1)
        ZEND_ARG_INFO(0, function_name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_alias, 0, 0, 2)
        ZEND_ARG_INFO(0, user_class_name)
        ZEND_ARG_INFO(0, alias_name)
        ZEND_ARG_INFO(0, autoload)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_get_included_files, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_trigger_error, 0, 0, 1)
        ZEND_ARG_INFO(0, messsage)
        ZEND_ARG_INFO(0, error_type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_set_error_handler, 0, 0, 1)
        ZEND_ARG_INFO(0, error_handler)
        ZEND_ARG_INFO(0, error_types)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_restore_error_handler, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_set_exception_handler, 0, 0, 1)
        ZEND_ARG_INFO(0, exception_handler)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_restore_exception_handler, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_get_declared_classes, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_get_declared_interfaces, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_get_defined_functions, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_get_defined_vars, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_create_function, 0, 0, 2)
        ZEND_ARG_INFO(0, args)
        ZEND_ARG_INFO(0, code)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_get_resource_type, 0, 0, 1)
        ZEND_ARG_INFO(0, res)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_get_loaded_extensions, 0, 0, 0)
        ZEND_ARG_INFO(0, zend_extensions)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_get_defined_constants, 0, 0, 0)
        ZEND_ARG_INFO(0, categorize)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_debug_print_backtrace, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_debug_backtrace, 0, 0, 0)
        ZEND_ARG_INFO(0, provide_object)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_extension_loaded, 0, 0, 1)
        ZEND_ARG_INFO(0, extension_name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_get_extension_funcs, 0, 0, 1)
        ZEND_ARG_INFO(0, extension_name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gc_collect_cycles, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gc_enabled, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gc_enable, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gc_disable, 0)
 ZEND_END_ARG_INFO()
 /* }}} */

diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index f50d73f375582a0f2e5696a9ac393cd6a795e9e5..42d9a0e354d5199283abcb8e05e7a5ee1781578a 100644 (file)
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -683,7 +683,6 @@ ZEND_METHOD(exception, __toString)
  * And never try to change the state of exceptions and never implement anything
  * that gives the user anything to accomplish this.
  */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_exception___construct, 0, 0, 0)
        ZEND_ARG_INFO(0, message)
        ZEND_ARG_INFO(0, code)
@@ -704,7 +703,6 @@ static const zend_function_entry default_exception_functions[] = {
        {NULL, NULL, NULL}
 };
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_error_exception___construct, 0, 0, 0)
        ZEND_ARG_INFO(0, message)
        ZEND_ARG_INFO(0, code)

diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c
index d821273b65ad87bbaf2fb6f783373c34de5fbf16..4a7620d0d50539c26c84c45b3a5656c69f98c010 100755 (executable)
--- a/Zend/zend_interfaces.c
+++ b/Zend/zend_interfaces.c
@@ -506,17 +506,14 @@ const zend_function_entry zend_funcs_iterator[] = {
 
 const zend_function_entry *zend_funcs_traversable    = NULL;
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_arrayaccess_offset, 0, 0, 1)
        ZEND_ARG_INFO(0, offset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_arrayaccess_offset_get, 0, 0, 1) /* actually this should be return by ref but atm cannot be */
        ZEND_ARG_INFO(0, offset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_arrayaccess_offset_value, 0, 0, 2)
        ZEND_ARG_INFO(0, offset)
        ZEND_ARG_INFO(0, value)
@@ -530,7 +527,6 @@ const zend_function_entry zend_funcs_arrayaccess[] = {
        {NULL, NULL, NULL}
 };
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_serializable_serialize, 0)
        ZEND_ARG_INFO(0, serialized)
 ZEND_END_ARG_INFO()

diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c
index 53d7e9533325c94e042278aca235498c7609f438..63c8663bec2215db1e82783f570e59e4cd5f62db 100644 (file)
--- a/ext/bcmath/bcmath.c
+++ b/ext/bcmath/bcmath.c
@@ -36,41 +36,35 @@ static PHP_GINIT_FUNCTION(bcmath);
 static PHP_GSHUTDOWN_FUNCTION(bcmath);
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_bcadd, 0, 0, 2)
        ZEND_ARG_INFO(0, left_operand)
        ZEND_ARG_INFO(0, right_operand)
        ZEND_ARG_INFO(0, scale)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_bcsub, 0, 0, 2)
        ZEND_ARG_INFO(0, left_operand)
        ZEND_ARG_INFO(0, right_operand)
        ZEND_ARG_INFO(0, scale)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_bcmul, 0, 0, 2)
        ZEND_ARG_INFO(0, left_operand)
        ZEND_ARG_INFO(0, right_operand)
        ZEND_ARG_INFO(0, scale)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_bcdiv, 0, 0, 2)
        ZEND_ARG_INFO(0, left_operand)
        ZEND_ARG_INFO(0, right_operand)
        ZEND_ARG_INFO(0, scale)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_bcmod, 0)
        ZEND_ARG_INFO(0, left_operand)
        ZEND_ARG_INFO(0, right_operand)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_bcpowmod, 0, 0, 3)
        ZEND_ARG_INFO(0, x)
        ZEND_ARG_INFO(0, y)
@@ -78,27 +72,23 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_bcpowmod, 0, 0, 3)
        ZEND_ARG_INFO(0, scale)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_bcpow, 0, 0, 2)
        ZEND_ARG_INFO(0, x)
        ZEND_ARG_INFO(0, y)
        ZEND_ARG_INFO(0, scale)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_bcsqrt, 0, 0, 1)
        ZEND_ARG_INFO(0, operand)
        ZEND_ARG_INFO(0, scale)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_bccomp, 0, 0, 2)
        ZEND_ARG_INFO(0, left_operand)
        ZEND_ARG_INFO(0, right_operand)
        ZEND_ARG_INFO(0, scale)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_bcscale, 0)
        ZEND_ARG_INFO(0, scale)
 ZEND_END_ARG_INFO()

diff --git a/ext/bz2/bz2.c b/ext/bz2/bz2.c
index 32b2f01d5dcf2d3d79c0e92a872a96784928a36c..38f207c93f318c004943adb7def220cffaac4c20 100644 (file)
--- a/ext/bz2/bz2.c
+++ b/ext/bz2/bz2.c
@@ -52,41 +52,34 @@ static PHP_FUNCTION(bzcompress);
 static PHP_FUNCTION(bzdecompress);
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_bzread, 0, 0, 1)
        ZEND_ARG_INFO(0, bz)
        ZEND_ARG_INFO(0, length)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_bzopen, 0)
        ZEND_ARG_INFO(0, file)
        ZEND_ARG_INFO(0, mode)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_bzerrno, 0)
        ZEND_ARG_INFO(0, bz)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_bzerrstr, 0)
        ZEND_ARG_INFO(0, bz)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_bzerror, 0)
        ZEND_ARG_INFO(0, bz)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_bzcompress, 0, 0, 2)
        ZEND_ARG_INFO(0, source)
        ZEND_ARG_INFO(0, blocksize)
        ZEND_ARG_INFO(0, workfactor)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_bzdecompress, 0, 0, 1)
        ZEND_ARG_INFO(0, source)
        ZEND_ARG_INFO(0, small)

diff --git a/ext/calendar/calendar.c b/ext/calendar/calendar.c
index 3c3a1e1c984a2de81c5eeca2b1409a74fa80a6a9..e915050d3fd3109383af3dbe4cd9f1aee1785867 100644 (file)
--- a/ext/calendar/calendar.c
+++ b/ext/calendar/calendar.c
@@ -38,29 +38,24 @@
 ZEND_DECLARE_MODULE_GLOBALS(calendar);
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_unixtojd, 0, 0, 0)
        ZEND_ARG_INFO(0, timestamp)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_jdtounix, 0)
        ZEND_ARG_INFO(0, jday)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_cal_info, 0, 0, 0)
        ZEND_ARG_INFO(0, calendar)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_cal_days_in_month, 0)
        ZEND_ARG_INFO(0, calendar)
        ZEND_ARG_INFO(0, month)
        ZEND_ARG_INFO(0, year)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_cal_to_jd, 0)
        ZEND_ARG_INFO(0, calendar)
        ZEND_ARG_INFO(0, month)
@@ -68,80 +63,67 @@ ZEND_BEGIN_ARG_INFO(arginfo_cal_to_jd, 0)
        ZEND_ARG_INFO(0, year)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_cal_from_jd, 0)
        ZEND_ARG_INFO(0, jd)
        ZEND_ARG_INFO(0, calendar)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_jdtogregorian, 0)
        ZEND_ARG_INFO(0, juliandaycount)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gregoriantojd, 0)
        ZEND_ARG_INFO(0, month)
        ZEND_ARG_INFO(0, day)
        ZEND_ARG_INFO(0, year)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_jdtojulian, 0)
        ZEND_ARG_INFO(0, juliandaycount)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_juliantojd, 0)
        ZEND_ARG_INFO(0, month)
        ZEND_ARG_INFO(0, day)
        ZEND_ARG_INFO(0, year)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_jdtojewish, 0, 0, 1)
        ZEND_ARG_INFO(0, juliandaycount)
        ZEND_ARG_INFO(0, hebrew)
        ZEND_ARG_INFO(0, fl)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_jewishtojd, 0)
        ZEND_ARG_INFO(0, month)
        ZEND_ARG_INFO(0, day)
        ZEND_ARG_INFO(0, year)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_jdtofrench, 0)
        ZEND_ARG_INFO(0, juliandaycount)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_frenchtojd, 0)
        ZEND_ARG_INFO(0, month)
        ZEND_ARG_INFO(0, day)
        ZEND_ARG_INFO(0, year)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_jddayofweek, 0, 0, 1)
        ZEND_ARG_INFO(0, juliandaycount)
        ZEND_ARG_INFO(0, mode)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_jdmonthname, 0)
        ZEND_ARG_INFO(0, juliandaycount)
        ZEND_ARG_INFO(0, mode)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_easter_date, 0, 0, 0)
        ZEND_ARG_INFO(0, year)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_easter_days, 0, 0, 0)
        ZEND_ARG_INFO(0, year)
        ZEND_ARG_INFO(0, method)

diff --git a/ext/com_dotnet/com_extension.c b/ext/com_dotnet/com_extension.c
index cc5b1c1604b207c9bce9b2a5f49e2b50c87e5f7e..c57bfe22aa62d2d078264c0d1e1a2272c886d6e6 100644 (file)
--- a/ext/com_dotnet/com_extension.c
+++ b/ext/com_dotnet/com_extension.c
@@ -40,122 +40,101 @@ zend_class_entry
        *php_com_saproxy_class_entry;
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_set, 0, 0, 2)
        ZEND_ARG_INFO(0, variant)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_add, 0, 0, 2)
        ZEND_ARG_INFO(0, left)
        ZEND_ARG_INFO(0, right)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_cat, 0, 0, 2)
        ZEND_ARG_INFO(0, left)
        ZEND_ARG_INFO(0, right)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_sub, 0, 0, 2)
        ZEND_ARG_INFO(0, left)
        ZEND_ARG_INFO(0, right)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_mul, 0, 0, 2)
        ZEND_ARG_INFO(0, left)
        ZEND_ARG_INFO(0, right)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_and, 0, 0, 2)
        ZEND_ARG_INFO(0, left)
        ZEND_ARG_INFO(0, right)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_div, 0, 0, 2)
        ZEND_ARG_INFO(0, left)
        ZEND_ARG_INFO(0, right)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_eqv, 0, 0, 2)
        ZEND_ARG_INFO(0, left)
        ZEND_ARG_INFO(0, right)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_idiv, 0, 0, 2)
        ZEND_ARG_INFO(0, left)
        ZEND_ARG_INFO(0, right)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_imp, 0, 0, 2)
        ZEND_ARG_INFO(0, left)
        ZEND_ARG_INFO(0, right)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_mod, 0, 0, 2)
        ZEND_ARG_INFO(0, left)
        ZEND_ARG_INFO(0, right)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_or, 0, 0, 2)
        ZEND_ARG_INFO(0, left)
        ZEND_ARG_INFO(0, right)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_pow, 0, 0, 2)
        ZEND_ARG_INFO(0, left)
        ZEND_ARG_INFO(0, right)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_xor, 0, 0, 2)
        ZEND_ARG_INFO(0, left)
        ZEND_ARG_INFO(0, right)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_abs, 0, 0, 1)
        ZEND_ARG_INFO(0, left)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_fix, 0, 0, 1)
        ZEND_ARG_INFO(0, left)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_int, 0, 0, 1)
        ZEND_ARG_INFO(0, left)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_neg, 0, 0, 1)
        ZEND_ARG_INFO(0, left)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_not, 0, 0, 1)
        ZEND_ARG_INFO(0, left)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_round, 0, 0, 2)
        ZEND_ARG_INFO(0, left)
        ZEND_ARG_INFO(0, decimals)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_cmp, 0, 0, 2)
        ZEND_ARG_INFO(0, left)
        ZEND_ARG_INFO(0, right)
@@ -163,63 +142,52 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_cmp, 0, 0, 2)
        ZEND_ARG_INFO(0, flags)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_date_to_timestamp, 0, 0, 1)
        ZEND_ARG_INFO(0, variant)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_date_from_timestamp, 0, 0, 1)
        ZEND_ARG_INFO(0, timestamp)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_get_type, 0, 0, 1)
        ZEND_ARG_INFO(0, variant)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_set_type, 0, 0, 2)
        ZEND_ARG_INFO(0, variant)
        ZEND_ARG_INFO(0, type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_variant_cast, 0, 0, 2)
        ZEND_ARG_INFO(0, variant)
        ZEND_ARG_INFO(0, type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_com_get_active_object, 0, 0, 1)
        ZEND_ARG_INFO(0, progid)
        ZEND_ARG_INFO(0, code_page)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_com_create_guid, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_com_event_sink, 0, 0, 2)
        ZEND_ARG_INFO(0, comobject)
        ZEND_ARG_INFO(0, sinkobject)
        ZEND_ARG_INFO(0, sinkinterface)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_com_print_typeinfo, 0, 0, 1)
        ZEND_ARG_INFO(0, comobject)
        ZEND_ARG_INFO(0, dispinterface)
        ZEND_ARG_INFO(0, wantsink)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_com_message_pump, 0, 0, 0)
        ZEND_ARG_INFO(0, timeoutms)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_com_load_typelib, 0, 0, 1)
        ZEND_ARG_INFO(0, typelib_name)
        ZEND_ARG_INFO(0, case_insensitive)

diff --git a/ext/ctype/ctype.c b/ext/ctype/ctype.c
index 809e9fc661b1534ab23db208618b6942bf7ec721..b162c3219c9dc3acd701049a290576e067a11bc0 100644 (file)
--- a/ext/ctype/ctype.c
+++ b/ext/ctype/ctype.c
@@ -45,57 +45,46 @@ static PHP_FUNCTION(ctype_upper);
 static PHP_FUNCTION(ctype_xdigit);
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ctype_alnum, 0)
        ZEND_ARG_INFO(0, text)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ctype_alpha, 0)
        ZEND_ARG_INFO(0, text)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ctype_cntrl, 0)
        ZEND_ARG_INFO(0, text)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ctype_digit, 0)
        ZEND_ARG_INFO(0, text)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ctype_lower, 0)
        ZEND_ARG_INFO(0, text)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ctype_graph, 0)
        ZEND_ARG_INFO(0, text)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ctype_print, 0)
        ZEND_ARG_INFO(0, text)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ctype_punct, 0)
        ZEND_ARG_INFO(0, text)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ctype_space, 0)
        ZEND_ARG_INFO(0, text)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ctype_upper, 0)
        ZEND_ARG_INFO(0, text)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ctype_xdigit, 0)
        ZEND_ARG_INFO(0, text)
 ZEND_END_ARG_INFO()

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index f10376bcd7c971d5c3edc511d05ca6f2f790a045..b3a23861be5a40d47a49919d1dc3f59d9245fc38 100644 (file)
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -187,100 +187,82 @@ static void _php_curl_close(zend_rsrc_list_entry *rsrc TSRMLS_DC);
        }
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_curl_version, 0, 0, 0)
        ZEND_ARG_INFO(0, version)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_curl_init, 0, 0, 0)
        ZEND_ARG_INFO(0, url)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_curl_copy_handle, 0)
        ZEND_ARG_INFO(0, ch)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_curl_setopt, 0)
        ZEND_ARG_INFO(0, ch)
        ZEND_ARG_INFO(0, option)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_curl_setopt_array, 0)
        ZEND_ARG_INFO(0, ch)
        ZEND_ARG_ARRAY_INFO(0, options, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_curl_exec, 0)
        ZEND_ARG_INFO(0, ch)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_curl_getinfo, 0, 0, 1)
        ZEND_ARG_INFO(0, ch)
        ZEND_ARG_INFO(0, option)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_curl_error, 0)
        ZEND_ARG_INFO(0, ch)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_curl_errno, 0)
        ZEND_ARG_INFO(0, ch)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_curl_close, 0)
        ZEND_ARG_INFO(0, ch)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_curl_multi_init, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_curl_multi_add_handle, 0)
        ZEND_ARG_INFO(0, mh)
        ZEND_ARG_INFO(0, ch)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_curl_multi_remove_handle, 0)
        ZEND_ARG_INFO(0, mh)
        ZEND_ARG_INFO(0, ch)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_curl_multi_select, 0, 0, 1)
        ZEND_ARG_INFO(0, mh)
        ZEND_ARG_INFO(0, timeout)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_curl_multi_exec, 0, 0, 1)
        ZEND_ARG_INFO(0, mh)
        ZEND_ARG_INFO(1, still_running)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_curl_multi_getcontent, 0)
        ZEND_ARG_INFO(0, ch)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_curl_multi_info_read, 0, 0, 1)
        ZEND_ARG_INFO(0, mh)
        ZEND_ARG_INFO(0, msgs_in_queue)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_curl_multi_close, 0)
        ZEND_ARG_INFO(0, mh)
 ZEND_END_ARG_INFO()

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 61e9e808ec5d3cb042bac3949f8fdac4928b7ef9..f4199df03b5468fad2e3ecfd1dd2f5785838433b 100644 (file)
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -33,31 +33,26 @@
 #include <unicode/udat.h>
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date, 0, 0, 1)
        ZEND_ARG_INFO(0, format)
        ZEND_ARG_INFO(0, timestamp)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_gmdate, 0, 0, 1)
        ZEND_ARG_INFO(0, format)
        ZEND_ARG_INFO(0, timestamp)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_idate, 0, 0, 1)
        ZEND_ARG_INFO(0, format)
        ZEND_ARG_INFO(0, timestamp)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_strtotime, 0, 0, 1)
        ZEND_ARG_INFO(0, time)
        ZEND_ARG_INFO(0, now)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mktime, 0, 0, 0)
        ZEND_ARG_INFO(0, hour)
        ZEND_ARG_INFO(0, min)
@@ -67,7 +62,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mktime, 0, 0, 0)
        ZEND_ARG_INFO(0, year)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_gmmktime, 0, 0, 0)
        ZEND_ARG_INFO(0, hour)
        ZEND_ARG_INFO(0, min)
@@ -77,50 +71,41 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_gmmktime, 0, 0, 0)
        ZEND_ARG_INFO(0, year)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_checkdate, 0)
        ZEND_ARG_INFO(0, month)
        ZEND_ARG_INFO(0, day)
        ZEND_ARG_INFO(0, year)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_strftime, 0, 0, 1)
        ZEND_ARG_INFO(0, format)
        ZEND_ARG_INFO(0, timestamp)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_gmstrftime, 0, 0, 1)
        ZEND_ARG_INFO(0, format)
        ZEND_ARG_INFO(0, timestamp)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_time, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_localtime, 0, 0, 0)
        ZEND_ARG_INFO(0, timestamp)
        ZEND_ARG_INFO(0, associative_array)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_getdate, 0, 0, 0)
        ZEND_ARG_INFO(0, timestamp)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_date_default_timezone_set, 0)
        ZEND_ARG_INFO(0, timezone_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_date_default_timezone_get, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_sunrise, 0, 0, 1)
        ZEND_ARG_INFO(0, time)
        ZEND_ARG_INFO(0, format)
@@ -130,7 +115,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_date_sunrise, 0, 0, 1)
        ZEND_ARG_INFO(0, gmt_offset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_sunset, 0, 0, 1)
        ZEND_ARG_INFO(0, time)
        ZEND_ARG_INFO(0, format)
@@ -140,128 +124,105 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_date_sunset, 0, 0, 1)
        ZEND_ARG_INFO(0, gmt_offset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_date_sun_info, 0)
        ZEND_ARG_INFO(0, time)
        ZEND_ARG_INFO(0, latitude)
        ZEND_ARG_INFO(0, longitude)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_create, 0, 0, 0)
        ZEND_ARG_INFO(0, time)
        ZEND_ARG_INFO(0, object)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_create_from_format, 0, 0, 2)
        ZEND_ARG_INFO(0, format)
        ZEND_ARG_INFO(0, time)
        ZEND_ARG_INFO(0, object)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_parse, 0, 0, 1)
        ZEND_ARG_INFO(0, date)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_parse_from_format, 0, 0, 2)
        ZEND_ARG_INFO(0, format)
        ZEND_ARG_INFO(0, date)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_date_get_last_errors, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_format, 0, 0, 2)
        ZEND_ARG_INFO(0, object)
        ZEND_ARG_INFO(0, format)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_format, 0, 0, 1)
        ZEND_ARG_INFO(0, format)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_modify, 0, 0, 2)
        ZEND_ARG_INFO(0, object)
        ZEND_ARG_INFO(0, modify)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_modify, 0, 0, 1)
        ZEND_ARG_INFO(0, modify)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_add, 0, 0, 2)
        ZEND_ARG_INFO(0, object)
        ZEND_ARG_INFO(0, interval)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_add, 0, 0, 1)
        ZEND_ARG_INFO(0, interval)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_sub, 0, 0, 2)
        ZEND_ARG_INFO(0, object)
        ZEND_ARG_INFO(0, interval)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_sub, 0, 0, 1)
        ZEND_ARG_INFO(0, interval)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_timezone_get, 0, 0, 1)
        ZEND_ARG_INFO(0, object)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_date_method_timezone_get, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_timezone_set, 0, 0, 2)
        ZEND_ARG_INFO(0, object)
        ZEND_ARG_INFO(0, timezone)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_timezone_set, 0, 0, 1)
        ZEND_ARG_INFO(0, timezone)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_offset_get, 0, 0, 1)
        ZEND_ARG_INFO(0, object)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_date_method_offset_get, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_diff, 0, 0, 2)
        ZEND_ARG_INFO(0, object)
        ZEND_ARG_INFO(0, object2)
        ZEND_ARG_INFO(0, absolute)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_diff, 0, 0, 1)
        ZEND_ARG_INFO(0, object)
        ZEND_ARG_INFO(0, absolute)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_time_set, 0, 0, 3)
        ZEND_ARG_INFO(0, object)
        ZEND_ARG_INFO(0, hour)
@@ -269,14 +230,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_date_time_set, 0, 0, 3)
        ZEND_ARG_INFO(0, second)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_time_set, 0, 0, 2)
        ZEND_ARG_INFO(0, hour)
        ZEND_ARG_INFO(0, minute)
        ZEND_ARG_INFO(0, second)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_date_set, 0, 0, 4)
        ZEND_ARG_INFO(0, object)
        ZEND_ARG_INFO(0, year)
@@ -284,14 +243,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_date_date_set, 0, 0, 4)
        ZEND_ARG_INFO(0, day)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_date_set, 0, 0, 3)
        ZEND_ARG_INFO(0, year)
        ZEND_ARG_INFO(0, month)
        ZEND_ARG_INFO(0, day)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_isodate_set, 0, 0, 3)
        ZEND_ARG_INFO(0, object)
        ZEND_ARG_INFO(0, year)
@@ -299,123 +256,100 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_date_isodate_set, 0, 0, 3)
        ZEND_ARG_INFO(0, day)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_isodate_set, 0, 0, 2)
        ZEND_ARG_INFO(0, year)
        ZEND_ARG_INFO(0, week)
        ZEND_ARG_INFO(0, day)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_timestamp_set, 0, 0, 2)
        ZEND_ARG_INFO(0, object)
        ZEND_ARG_INFO(0, unixtimestamp)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_timestamp_set, 0, 0, 1)
        ZEND_ARG_INFO(0, unixtimestamp)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_timestamp_get, 0, 0, 1)
        ZEND_ARG_INFO(0, object)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_date_method_timestamp_get, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_timezone_open, 0, 0, 1)
        ZEND_ARG_INFO(0, timezone)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_timezone_name_get, 0, 0, 1)
        ZEND_ARG_INFO(0, object)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_timezone_method_name_get, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_timezone_name_from_abbr, 0, 0, 1)
        ZEND_ARG_INFO(0, abbr)
        ZEND_ARG_INFO(0, gmtoffset)
        ZEND_ARG_INFO(0, isdst)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_timezone_offset_get, 0, 0, 2)
        ZEND_ARG_INFO(0, object)
        ZEND_ARG_INFO(0, datetime)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_timezone_method_offset_get, 0, 0, 1)
        ZEND_ARG_INFO(0, datetime)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_timezone_transitions_get, 0, 0, 1)
        ZEND_ARG_INFO(0, object)
        ZEND_ARG_INFO(0, timestamp_begin)
        ZEND_ARG_INFO(0, timestamp_end)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_timezone_method_transitions_get, 0)
        ZEND_ARG_INFO(0, timestamp_begin)
        ZEND_ARG_INFO(0, timestamp_end)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_timezone_location_get, 0, 0, 1)
        ZEND_ARG_INFO(0, object)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_timezone_method_location_get, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_timezone_identifiers_list, 0, 0, 0)
        ZEND_ARG_INFO(0, what)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_timezone_abbreviations_list, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_interval_create_from_date_string, 0, 0, 1)
        ZEND_ARG_INFO(0, time)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_interval_format, 0, 0, 1)
        ZEND_ARG_INFO(0, object)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_date_method_interval_format, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_period_construct, 0, 0, 3)
        ZEND_ARG_INFO(0, start)
        ZEND_ARG_INFO(0, interval)
        ZEND_ARG_INFO(0, end)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_interval_construct, 0, 0, 0)
        ZEND_ARG_INFO(0, interval_spec)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date_format_locale, 0, 0, 2)
        ZEND_ARG_INFO(0, object)
        ZEND_ARG_INFO(0, format)

diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index 681d1e2384b3f5d6f8fa8d25651f6400b67fa9ea..0426d38b2b91d035ea8c41f466afe259bbdf0d41 100644 (file)
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -52,7 +52,6 @@
 #include "php_qdbm.h"
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_popen, 0, 0, 2)
        ZEND_ARG_INFO(0, path)
        ZEND_ARG_INFO(0, mode)
@@ -60,7 +59,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_popen, 0, 0, 2)
        ZEND_ARG_INFO(0, ...)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_open, 0, 0, 2)
        ZEND_ARG_INFO(0, path)
        ZEND_ARG_INFO(0, mode)
@@ -68,75 +66,62 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_open, 0, 0, 2)
        ZEND_ARG_INFO(0, ...)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dba_close, 0)
        ZEND_ARG_INFO(0, handle)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dba_exists, 0)
        ZEND_ARG_INFO(0, key)
        ZEND_ARG_INFO(0, handle)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_fetch, 0, 0, 2)
        ZEND_ARG_INFO(0, key)
        ZEND_ARG_INFO(0, skip)
        ZEND_ARG_INFO(0, handle)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dba_key_split, 0)
        ZEND_ARG_INFO(0, key)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dba_firstkey, 0)
        ZEND_ARG_INFO(0, handle)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dba_nextkey, 0)
        ZEND_ARG_INFO(0, handle)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dba_delete, 0)
        ZEND_ARG_INFO(0, key)
        ZEND_ARG_INFO(0, handle)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dba_insert, 0)
        ZEND_ARG_INFO(0, key)
        ZEND_ARG_INFO(0, value)
        ZEND_ARG_INFO(0, handle)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dba_replace, 0)
        ZEND_ARG_INFO(0, key)
        ZEND_ARG_INFO(0, value)
        ZEND_ARG_INFO(0, handle)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dba_optimize, 0)
        ZEND_ARG_INFO(0, handle)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dba_sync, 0)
        ZEND_ARG_INFO(0, handle)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_handlers, 0, 0, 0)
        ZEND_ARG_INFO(0, full_info)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dba_list, 0)
 ZEND_END_ARG_INFO()
 

diff --git a/ext/dom/attr.c b/ext/dom/attr.c
index 2897d944d81e453949b9ef6ff271d36f5bb322ab..b299182948d471bed47dee69aec26acb7ffe5aa7 100644 (file)
--- a/ext/dom/attr.c
+++ b/ext/dom/attr.c
@@ -30,11 +30,9 @@
 #include "php_dom.h"
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_attr_is_id, 0, 0, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_attr_construct, 0, 0, 1)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, value)

diff --git a/ext/dom/cdatasection.c b/ext/dom/cdatasection.c
index 4e6d2ba0f8053f66abe1d3f69a523b41ee8cf388..fd81aff88be002725e7afaba025585671194df37 100644 (file)
--- a/ext/dom/cdatasection.c
+++ b/ext/dom/cdatasection.c
@@ -28,7 +28,6 @@
 #include "php_dom.h"
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_cdatasection_construct, 0, 0, 1)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO();

diff --git a/ext/dom/characterdata.c b/ext/dom/characterdata.c
index a5aa3cf13ffa62ab74e2f9c3a61bb95dff726261..757de35549a45a8827b34a80fd38158ca8b392ec 100644 (file)
--- a/ext/dom/characterdata.c
+++ b/ext/dom/characterdata.c
@@ -29,30 +29,25 @@
 
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_characterdata_substring_data, 0, 0, 2)
        ZEND_ARG_INFO(0, offset)
        ZEND_ARG_INFO(0, count)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_characterdata_append_data, 0, 0, 1)
        ZEND_ARG_INFO(0, arg)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_characterdata_insert_data, 0, 0, 2)
        ZEND_ARG_INFO(0, offset)
        ZEND_ARG_INFO(0, arg)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_characterdata_delete_data, 0, 0, 2)
        ZEND_ARG_INFO(0, offset)
        ZEND_ARG_INFO(0, count)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_characterdata_replace_data, 0, 0, 3)
        ZEND_ARG_INFO(0, offset)
        ZEND_ARG_INFO(0, count)

diff --git a/ext/dom/comment.c b/ext/dom/comment.c
index 76b37f4002d2e855dd81fa9364249e738b8fde31..e84c9d218ca9df35c11ae65d407edee245624b02 100644 (file)
--- a/ext/dom/comment.c
+++ b/ext/dom/comment.c
@@ -28,7 +28,6 @@
 #include "php_dom.h"
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_comment_construct, 0, 0, 0)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO();

diff --git a/ext/dom/document.c b/ext/dom/document.c
index b2611db9550d64aaadeedd60ad2bd6a2842eaa58..478738ac2a2a71be4fffaae5a4cf0e792f4851ff 100644 (file)
--- a/ext/dom/document.c
+++ b/ext/dom/document.c
@@ -44,175 +44,142 @@ struct _idsIterator {
 #define DOM_LOAD_FILE 1
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_create_element, 0, 0, 1)
        ZEND_ARG_INFO(0, tagName)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_create_document_fragment, 0, 0, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_create_text_node, 0, 0, 1)
        ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_create_comment, 0, 0, 1)
        ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_create_cdatasection, 0, 0, 1)
        ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_create_processing_instruction, 0, 0, 2)
        ZEND_ARG_INFO(0, target)
        ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_create_attribute, 0, 0, 1)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_create_entity_reference, 0, 0, 1)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_get_elements_by_tag_name, 0, 0, 1)
        ZEND_ARG_INFO(0, tagName)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_import_node, 0, 0, 2)
        ZEND_ARG_OBJ_INFO(0, importedNode, DOMNode, 0)
        ZEND_ARG_INFO(0, deep)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_create_element_ns, 0, 0, 2)
        ZEND_ARG_INFO(0, namespaceURI)
        ZEND_ARG_INFO(0, qualifiedName)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_create_attribute_ns, 0, 0, 2)
        ZEND_ARG_INFO(0, namespaceURI)
        ZEND_ARG_INFO(0, qualifiedName)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_get_elements_by_tag_name_ns, 0, 0, 2)
        ZEND_ARG_INFO(0, namespaceURI)
        ZEND_ARG_INFO(0, localName)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_get_element_by_id, 0, 0, 1)
        ZEND_ARG_INFO(0, elementId)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_adopt_node, 0, 0, 1)
        ZEND_ARG_OBJ_INFO(0, source, DOMNode, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_normalize_document, 0, 0, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_rename_node, 0, 0, 3)
        ZEND_ARG_OBJ_INFO(0, node, DOMNode, 0)
        ZEND_ARG_INFO(0, namespaceURI)
        ZEND_ARG_INFO(0, qualifiedName)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_load, 0, 0, 1)
        ZEND_ARG_INFO(0, source)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_save, 0, 0, 1)
        ZEND_ARG_INFO(0, file)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_loadxml, 0, 0, 1)
        ZEND_ARG_INFO(0, source)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_savexml, 0, 0, 0)
        ZEND_ARG_OBJ_INFO(0, node, DOMNode, 1)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_construct, 0, 0, 0)
        ZEND_ARG_INFO(0, version)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_validate, 0, 0, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_xinclude, 0, 0, 0)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_loadhtml, 0, 0, 1)
        ZEND_ARG_INFO(0, source)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_loadhtmlfile, 0, 0, 1)
        ZEND_ARG_INFO(0, source)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_savehtml, 0, 0, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_savehtmlfile, 0, 0, 1)
        ZEND_ARG_INFO(0, file)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_schema_validate_file, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_schema_validate_xml, 0, 0, 1)
        ZEND_ARG_INFO(0, source)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_relaxNG_validate_file, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_relaxNG_validate_xml, 0, 0, 1)
        ZEND_ARG_INFO(0, source)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_document_registernodeclass, 0, 0, 2)
        ZEND_ARG_INFO(0, baseClass)
        ZEND_ARG_INFO(0, extendedClass)

diff --git a/ext/dom/documentfragment.c b/ext/dom/documentfragment.c
index 0748655cc5d5f235a8b8c47410d12afbc9485183..a4bdb27a6b299772103636968fb0d928599c9fc0 100644 (file)
--- a/ext/dom/documentfragment.c
+++ b/ext/dom/documentfragment.c
@@ -28,11 +28,9 @@
 #include "php_dom.h"
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_documentfragement_construct, 0, 0, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_documentfragement_appendXML, 0, 0, 1)
        ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO();

diff --git a/ext/dom/domconfiguration.c b/ext/dom/domconfiguration.c
index db216186fbe82b0f74d9e173f416ca8e7828dec6..382baa749d5397b66172f92f68d7564053145a5e 100644 (file)
--- a/ext/dom/domconfiguration.c
+++ b/ext/dom/domconfiguration.c
@@ -28,18 +28,15 @@
 #include "php_dom.h"
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_configuration_set_parameter, 0, 0, 2)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_configuration_get_parameter, 0, 0, 0)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_configuration_can_set_parameter, 0, 0, 0)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, value)

diff --git a/ext/dom/domerrorhandler.c b/ext/dom/domerrorhandler.c
index fc916eed3dee2fde88f6ea0f93d27e82697b6bdb..c8d965d0148fa9b4ecf39fa109ab8d6fba299447 100644 (file)
--- a/ext/dom/domerrorhandler.c
+++ b/ext/dom/domerrorhandler.c
@@ -28,7 +28,6 @@
 #include "php_dom.h"
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_domerrorhandler_handle_error, 0, 0, 1)
        ZEND_ARG_OBJ_INFO(0, error, DOMError, 0)
 ZEND_END_ARG_INFO();

diff --git a/ext/dom/domimplementation.c b/ext/dom/domimplementation.c
index d1d7642041dab1b12953fdf0f4da1d976671cb90..d047c92c75cead89b8d626504c0b8b6c0682a09d 100644 (file)
--- a/ext/dom/domimplementation.c
+++ b/ext/dom/domimplementation.c
@@ -28,24 +28,20 @@
 #include "php_dom.h"
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_implementation_get_feature, 0, 0, 2)
        ZEND_ARG_INFO(0, feature)
        ZEND_ARG_INFO(0, version)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_implementation_has_feature, 0, 0, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_implementation_create_documenttype, 0, 0, 3)
        ZEND_ARG_INFO(0, qualifiedName)
        ZEND_ARG_INFO(0, publicId)
        ZEND_ARG_INFO(0, systemId)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_implementation_create_document, 0, 0, 3)
        ZEND_ARG_INFO(0, namespaceURI)
        ZEND_ARG_INFO(0, qualifiedName)

diff --git a/ext/dom/domimplementationlist.c b/ext/dom/domimplementationlist.c
index e3cfa22daae030b06a0b3659913f6b274b3b9a82..e6fa63225718c975acc465bbce1f8f10d6a76bff 100644 (file)
--- a/ext/dom/domimplementationlist.c
+++ b/ext/dom/domimplementationlist.c
@@ -28,7 +28,6 @@
 #include "php_dom.h"
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_implementationlist_item, 0, 0, 1)
        ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO();

diff --git a/ext/dom/domimplementationsource.c b/ext/dom/domimplementationsource.c
index d0cc0cdafe3139a709b42181db61d6e203bd8676..5a634fa56907819e23e5edf92e191ea1045448e9 100644 (file)
--- a/ext/dom/domimplementationsource.c
+++ b/ext/dom/domimplementationsource.c
@@ -29,12 +29,10 @@
 
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_implementationsource_getdomimplementation, 0, 0, 1)
        ZEND_ARG_INFO(0, features)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_implementationsource_getdomimplementations, 0, 0, 1)
        ZEND_ARG_INFO(0, features)
 ZEND_END_ARG_INFO();

diff --git a/ext/dom/domstringlist.c b/ext/dom/domstringlist.c
index 297ab0212f059528adf193568ef8c57fb75f3ffc..ee7974b668fcd376a2c08f2a2a53f0dea319b97c 100644 (file)
--- a/ext/dom/domstringlist.c
+++ b/ext/dom/domstringlist.c
@@ -28,7 +28,6 @@
 #include "php_dom.h"
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_stringlist_item, 0, 0, 1)
        ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO();

diff --git a/ext/dom/element.c b/ext/dom/element.c
index 758c274834b7665c1639b2f72f82d6550a3b6ccc..c4371d2858f7d040a569d3001a96c007cba86d11 100644 (file)
--- a/ext/dom/element.c
+++ b/ext/dom/element.c
@@ -28,109 +28,90 @@
 #include "php_dom.h"
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_get_attribute, 0, 0, 1)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_set_attribute, 0, 0, 2)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_remove_attribute, 0, 0, 1)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_get_attribute_node, 0, 0, 1)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_set_attribute_node, 0, 0, 1)
        ZEND_ARG_OBJ_INFO(0, newAttr, DOMAttr, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_remove_attribute_node, 0, 0, 1)
        ZEND_ARG_OBJ_INFO(0, oldAttr, DOMAttr, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_get_elements_by_tag_name, 0, 0, 1)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_get_attribute_ns, 0, 0, 2)
        ZEND_ARG_INFO(0, namespaceURI)
        ZEND_ARG_INFO(0, localName)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_set_attribute_ns, 0, 0, 3)
        ZEND_ARG_INFO(0, namespaceURI)
        ZEND_ARG_INFO(0, qualifiedName)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_remove_attribute_ns, 0, 0, 2)
        ZEND_ARG_INFO(0, namespaceURI)
        ZEND_ARG_INFO(0, localName)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_get_attribute_node_ns, 0, 0, 2)
        ZEND_ARG_INFO(0, namespaceURI)
        ZEND_ARG_INFO(0, localName)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_set_attribute_node_ns, 0, 0, 1)
        ZEND_ARG_OBJ_INFO(0, newAttr, DOMAttr, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_get_elements_by_tag_name_ns, 0, 0, 2)
        ZEND_ARG_INFO(0, namespaceURI)
        ZEND_ARG_INFO(0, localName)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_has_attribute, 0, 0, 1)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_has_attribute_ns, 0, 0, 2)
        ZEND_ARG_INFO(0, namespaceURI)
        ZEND_ARG_INFO(0, localName)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_set_id_attribute, 0, 0, 2)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, isId)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_set_id_attribute_ns, 0, 0, 3)
        ZEND_ARG_INFO(0, namespaceURI)
        ZEND_ARG_INFO(0, localName)
        ZEND_ARG_INFO(0, isId)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_set_id_attribute_node, 0, 0, 2)
        ZEND_ARG_OBJ_INFO(0, attr, DOMAttr, 0)
        ZEND_ARG_INFO(0, isId)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_construct, 0, 0, 1)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, value)

diff --git a/ext/dom/entityreference.c b/ext/dom/entityreference.c
index 571e2a424d128c8be4e0131f1e29695fea2f0c6f..d12e00cdf49ad78e4ef707c89e9a7b91ad113def 100644 (file)
--- a/ext/dom/entityreference.c
+++ b/ext/dom/entityreference.c
@@ -28,7 +28,6 @@
 #include "php_dom.h"
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_entityreference_construct, 0, 0, 1)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO();

diff --git a/ext/dom/namednodemap.c b/ext/dom/namednodemap.c
index 74ccba793e31237e6c1b2b29454edba87d0640de..51d7e63d633ee963c90c92619ef837815d96d1a2 100644 (file)
--- a/ext/dom/namednodemap.c
+++ b/ext/dom/namednodemap.c
@@ -28,38 +28,31 @@
 #include "php_dom.h"
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_get_named_item, 0, 0, 1)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_set_named_item, 0, 0, 1)
        ZEND_ARG_OBJ_INFO(0, arg, DOMNode, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_remove_named_item, 0, 0, 0)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_item, 0, 0, 0)
        ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_get_named_item_ns, 0, 0, 0)
        ZEND_ARG_INFO(0, namespaceURI)
        ZEND_ARG_INFO(0, localName)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_set_named_item_ns, 0, 0, 0)
        ZEND_ARG_OBJ_INFO(0, arg, DOMNode, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_remove_named_item_ns, 0, 0, 0)
        ZEND_ARG_INFO(0, namespaceURI)
        ZEND_ARG_INFO(0, localName)

diff --git a/ext/dom/namelist.c b/ext/dom/namelist.c
index 14f6ad0166dd915f0d0defcc668650d05333dc89..c97b8e8ab3b8bad44fcbaa85c3bcc689a82ae114 100644 (file)
--- a/ext/dom/namelist.c
+++ b/ext/dom/namelist.c
@@ -28,12 +28,10 @@
 #include "php_dom.h"
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namelist_get_name, 0, 0, 1)
        ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namelist_get_namespace_uri, 0, 0, 1)
        ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO();

diff --git a/ext/dom/node.c b/ext/dom/node.c
index c067955a7c2801803f2c68b21162ac3d45581983..216cdd7fbf528c9ab82be3cd25cfa98cea897760 100644 (file)
--- a/ext/dom/node.c
+++ b/ext/dom/node.c
@@ -28,104 +28,84 @@
 #include "php_dom.h"
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_insert_before, 0, 0, 1)
        ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
        ZEND_ARG_OBJ_INFO(0, refChild, DOMNode, 1)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_replace_child, 0, 0, 2)
        ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
        ZEND_ARG_OBJ_INFO(0, oldChild, DOMNode, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_remove_child, 0, 0, 1)
        ZEND_ARG_OBJ_INFO(0, oldChild, DOMNode, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_append_child, 0, 0, 1)
        ZEND_ARG_OBJ_INFO(0, newChild, DOMNode, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_has_child_nodes, 0, 0, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_clone_node, 0, 0, 1)
        ZEND_ARG_INFO(0, deep)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_normalize, 0, 0, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_supported, 0, 0, 2)
        ZEND_ARG_INFO(0, feature)
        ZEND_ARG_INFO(0, version)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_has_attributes, 0, 0, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_compare_document_position, 0, 0, 1)
        ZEND_ARG_OBJ_INFO(0, other, DOMNode, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_same_node, 0, 0, 1)
        ZEND_ARG_OBJ_INFO(0, other, DOMNode, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_lookup_prefix, 0, 0, 1)
        ZEND_ARG_INFO(0, namespaceURI)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_default_namespace, 0, 0, 1)
        ZEND_ARG_INFO(0, namespaceURI)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_lookup_namespace_uri, 0, 0, 1)
        ZEND_ARG_INFO(0, prefix)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_is_equal_node, 0, 0, 1)
        ZEND_ARG_OBJ_INFO(0, arg, DOMNode, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_get_feature, 0, 0, 2)
        ZEND_ARG_INFO(0, feature)
        ZEND_ARG_INFO(0, version)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_set_user_data, 0, 0, 3)
        ZEND_ARG_INFO(0, key)
        ZEND_ARG_INFO(0, data)
        ZEND_ARG_INFO(0, handler)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_get_user_data, 0, 0, 1)
        ZEND_ARG_INFO(0, key)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_getNodePath, 0, 0, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_C14N, 0, 0, 0)
        ZEND_ARG_INFO(0, exclusive)
        ZEND_ARG_INFO(0, with_comments)
@@ -133,7 +113,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_C14N, 0, 0, 0)
        ZEND_ARG_ARRAY_INFO(0, ns_prefixes, 1)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_C14NFile, 0, 0, 1)
        ZEND_ARG_INFO(0, uri)
        ZEND_ARG_INFO(0, exclusive)

diff --git a/ext/dom/nodelist.c b/ext/dom/nodelist.c
index 06932658dd740f308961b614a45d68a4ec1d806e..3c6ae614ed9b5c9f363f03c2da75761257b1e249 100644 (file)
--- a/ext/dom/nodelist.c
+++ b/ext/dom/nodelist.c
@@ -29,7 +29,6 @@
 
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_nodelist_item, 0, 0, 1)
        ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO();

diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c
index 14a5d4cca9b390a0c2e538af5193ade6a17295d7..fc57d9e8d9d5c161afca6fc5ce6a071f926ab34a 100644 (file)
--- a/ext/dom/php_dom.c
+++ b/ext/dom/php_dom.c
@@ -482,7 +482,6 @@ zend_object_value dom_objects_store_clone_obj(zval *zobject TSRMLS_DC)
 }
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_import_simplexml, 0, 0, 1)
        ZEND_ARG_INFO(0, node)
 ZEND_END_ARG_INFO()

diff --git a/ext/dom/processinginstruction.c b/ext/dom/processinginstruction.c
index 02027afcd6a3671259d87dd2e285593a5d87281e..231954a2cc7ca43583222e84c9028362c71d4c49 100644 (file)
--- a/ext/dom/processinginstruction.c
+++ b/ext/dom/processinginstruction.c
@@ -28,7 +28,6 @@
 #include "php_dom.h"
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_processinginstruction_construct, 0, 0, 1)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, value)

diff --git a/ext/dom/string_extend.c b/ext/dom/string_extend.c
index ed827f824a9621329cb67c9d69b95316d8c0121e..12db8b9cf46f552a68d62bcca69b6c20e4f1c31e 100644 (file)
--- a/ext/dom/string_extend.c
+++ b/ext/dom/string_extend.c
@@ -28,12 +28,10 @@
 #include "php_dom.h"
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_string_extend_find_offset16, 0, 0, 1)
        ZEND_ARG_INFO(0, offset32)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_string_extend_find_offset32, 0, 0, 1)
        ZEND_ARG_INFO(0, offset16)
 ZEND_END_ARG_INFO();

diff --git a/ext/dom/text.c b/ext/dom/text.c
index 092e88427edf8dcb0feebce04e79b6b771ea7e3a..84708b318cefd06304f82b2aebf388cded1679ef 100644 (file)
--- a/ext/dom/text.c
+++ b/ext/dom/text.c
@@ -29,21 +29,17 @@
 #include "dom_ce.h"
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_text_split_text, 0, 0, 1)
        ZEND_ARG_INFO(0, offset)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_text_is_whitespace_in_element_content, 0, 0, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_text_replace_whole_text, 0, 0, 1)
        ZEND_ARG_INFO(0, content)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_text_construct, 0, 0, 0)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO();

diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c
index 63f48f69d39d22a748c6a085f5c0e79379511de2..ea507439adad42bb96b77b8e12cd96eba419e347 100644 (file)
--- a/ext/dom/xpath.c
+++ b/ext/dom/xpath.c
@@ -37,30 +37,25 @@
 #if defined(LIBXML_XPATH_ENABLED)
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_construct, 0, 0, 1)
        ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_register_ns, 0, 0, 2)
        ZEND_ARG_INFO(0, prefix)
        ZEND_ARG_INFO(0, uri)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_query, 0, 0, 1)
        ZEND_ARG_INFO(0, expr)
        ZEND_ARG_OBJ_INFO(0, context, DOMNode, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_evaluate, 0, 0, 1)
        ZEND_ARG_INFO(0, expr)
        ZEND_ARG_OBJ_INFO(0, context, DOMNode, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_xpath_register_php_functions, 0, 0, 0)
 ZEND_END_ARG_INFO();
 /* }}} */

diff --git a/ext/ereg/ereg.c b/ext/ereg/ereg.c
index cefc0d0f3a13c8f4937f11bcb7e7308daeb1e4c3..76e86cd959c3b127f896997ba2f54174436bc82e 100644 (file)
--- a/ext/ereg/ereg.c
+++ b/ext/ereg/ereg.c
@@ -27,49 +27,42 @@
 #include "ext/standard/info.h"
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ereg, 0, 0, 2)
        ZEND_ARG_INFO(0, pattern)
        ZEND_ARG_INFO(0, string) 
        ZEND_ARG_INFO(1, registers) /* ARRAY_INFO(1, registers, 1) */
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_eregi, 0, 0, 2)
        ZEND_ARG_INFO(0, pattern)
        ZEND_ARG_INFO(0, string) 
        ZEND_ARG_INFO(1, registers) /* ARRAY_INFO(1, registers, 1) */
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ereg_replace, 0)
        ZEND_ARG_INFO(0, pattern)
        ZEND_ARG_INFO(0, replacement)
        ZEND_ARG_INFO(0, string)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_eregi_replace, 0)
        ZEND_ARG_INFO(0, pattern)
        ZEND_ARG_INFO(0, replacement)
        ZEND_ARG_INFO(0, string)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_split, 0, 0, 2)
        ZEND_ARG_INFO(0, pattern)
        ZEND_ARG_INFO(0, string) 
        ZEND_ARG_INFO(0, limit)  
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_spliti, 0, 0, 2)
        ZEND_ARG_INFO(0, pattern)
        ZEND_ARG_INFO(0, string) 
        ZEND_ARG_INFO(0, limit)  
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sql_regcase, 0)
        ZEND_ARG_INFO(0, string)
 ZEND_END_ARG_INFO()

diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index 580ad5563c4189bb80b24ce03233c74c9c2a23f7..0e90c33f0179a6a33a243320986d892487476f5d 100644 (file)
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -102,12 +102,10 @@ typedef unsigned char uchar;
 #define MAX_IFD_NESTING_LEVEL 100
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_exif_tagname, 0)
        ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_exif_read_data, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, sections_needed)
@@ -115,7 +113,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_exif_read_data, 0, 0, 1)
        ZEND_ARG_INFO(0, read_thumbnail)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_exif_thumbnail, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(1, width)
@@ -123,7 +120,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_exif_thumbnail, 0, 0, 1)
        ZEND_ARG_INFO(1, imagetype)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_exif_imagetype, 0)
        ZEND_ARG_INFO(0, imagefile)
 ZEND_END_ARG_INFO()

diff --git a/ext/fbsql/php_fbsql.c b/ext/fbsql/php_fbsql.c
index 05b849132f095dd4fb3a858a19d31de464e77f7b..9b2d58719696649283e0b4ae1972dd99f2015d52 100644 (file)
--- a/ext/fbsql/php_fbsql.c
+++ b/ext/fbsql/php_fbsql.c
@@ -189,121 +189,101 @@ char *DigestPassword(char *user, char *password)
 }
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_connect, 0, 0, 0)
        ZEND_ARG_INFO(0, hostname)
        ZEND_ARG_INFO(0, username)
        ZEND_ARG_INFO(0, password)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_pconnect, 0, 0, 0)
        ZEND_ARG_INFO(0, username)
        ZEND_ARG_INFO(0, hostname)
        ZEND_ARG_INFO(0, password)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_close, 0, 0, 0)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_fbsql_set_transaction, 0)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, locking)
        ZEND_ARG_INFO(0, isolation)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_autocommit, 0, 0, 1)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, OnOff)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_commit, 0, 0, 0)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_rollback, 0, 0, 0)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_create_blob, 0, 0, 1)
        ZEND_ARG_INFO(0, blob_data)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_create_clob, 0, 0, 1)
        ZEND_ARG_INFO(0, clob_data)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_fbsql_set_lob_mode, 0)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, lob_mode)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_read_blob, 0, 0, 1)
        ZEND_ARG_INFO(0, blob_handle)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_read_clob, 0, 0, 1)
        ZEND_ARG_INFO(0, clob_handle)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_blob_size, 0, 0, 1)
        ZEND_ARG_INFO(0, blob_handle)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_clob_size, 0, 0, 1)
        ZEND_ARG_INFO(0, clob_handle)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_hostname, 0, 0, 1)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, host_name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_database, 0, 0, 1)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, database)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_database_password, 0, 0, 1)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, database_password)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_username, 0, 0, 1)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, username)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_password, 0, 0, 1)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, password)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_fbsql_set_password, 0)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, user)
@@ -311,20 +291,17 @@ ZEND_BEGIN_ARG_INFO(arginfo_fbsql_set_password, 0)
        ZEND_ARG_INFO(0, old_password)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_select_db, 0, 0, 0)
        ZEND_ARG_INFO(0, database_name)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_set_characterset, 0, 0, 2)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, charcterset)
        ZEND_ARG_INFO(0, in_out_both)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_change_user, 0, 0, 2)
        ZEND_ARG_INFO(0, user)
        ZEND_ARG_INFO(0, password)
@@ -332,209 +309,173 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_change_user, 0, 0, 2)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_create_db, 0, 0, 1)
        ZEND_ARG_INFO(0, database_name)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, database_options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_drop_db, 0, 0, 1)
        ZEND_ARG_INFO(0, database_name)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_start_db, 0, 0, 1)
        ZEND_ARG_INFO(0, database_name)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, database_options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_stop_db, 0, 0, 1)
        ZEND_ARG_INFO(0, database_name)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_db_status, 0, 0, 1)
        ZEND_ARG_INFO(0, database_name)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_query, 0, 0, 1)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, batch_size)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_db_query, 0, 0, 2)
        ZEND_ARG_INFO(0, database_name)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_list_dbs, 0, 0, 0)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_list_tables, 0, 0, 1)
        ZEND_ARG_INFO(0, database)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_list_fields, 0, 0, 2)
        ZEND_ARG_INFO(0, database_name)
        ZEND_ARG_INFO(0, table_name)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_error, 0, 0, 0)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_errno, 0, 0, 0)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_warnings, 0, 0, 0)
        ZEND_ARG_INFO(0, flag)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_affected_rows, 0, 0, 0)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_fbsql_rows_fetched, 0)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_insert_id, 0, 0, 0)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_result, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, row)
        ZEND_ARG_INFO(0, field)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_fbsql_next_result, 0)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_fbsql_num_rows, 0)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_fbsql_num_fields, 0)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_fbsql_fetch_row, 0)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_fbsql_fetch_assoc, 0)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_fetch_object, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, result_type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_fetch_array, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, result_type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_fbsql_data_seek, 0)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, row_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_fbsql_fetch_lengths, 0)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_fetch_field, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, field_index)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_field_seek, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, field_index)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_field_name, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, field_index)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_field_table, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, field_index)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_field_len, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, field_index)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_field_type, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, field_index)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_field_flags, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, field_index)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_fbsql_table_name, 0)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_fbsql_free_result, 0)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fbsql_get_autostart_info, 0, 0, 0)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()

diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c
index 1db520c41ad72e95bdae6255f1e4735d0c9578c6..03820025be586f951648b20c574966f9c39bb1d2 100644 (file)
--- a/ext/fileinfo/fileinfo.c
+++ b/ext/fileinfo/fileinfo.c
@@ -117,29 +117,24 @@ PHP_FILEINFO_API zend_object_value finfo_objects_new(zend_class_entry *class_typ
 /* }}} */
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_open, 0, 0, 0)
        ZEND_ARG_INFO(0, options)
        ZEND_ARG_INFO(0, arg)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_close, 0, 0, 1)
        ZEND_ARG_INFO(0, finfo)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_set_flags, 0, 0, 2)
        ZEND_ARG_INFO(0, finfo)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_method_set_flags, 0, 0, 1)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_file, 0, 0, 2)
        ZEND_ARG_INFO(0, finfo)
        ZEND_ARG_INFO(0, filename)
@@ -147,14 +142,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_file, 0, 0, 2)
        ZEND_ARG_INFO(0, context)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_method_file, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, options)
        ZEND_ARG_INFO(0, context)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_buffer, 0, 0, 2)
        ZEND_ARG_INFO(0, finfo)
        ZEND_ARG_INFO(0, string)
@@ -162,14 +155,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_buffer, 0, 0, 2)
        ZEND_ARG_INFO(0, context)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_method_buffer, 0, 0, 1)
        ZEND_ARG_INFO(0, string)
        ZEND_ARG_INFO(0, options)
        ZEND_ARG_INFO(0, context)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mime_content_type, 0, 0, 1)
        ZEND_ARG_INFO(0, string)
 ZEND_END_ARG_INFO()

diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index 3483463fe1b17ba6ccefb3f88b00514d25d1226c..7ba95f9bcdac4d5faef82e34acada4d64cc9e1a6 100644 (file)
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -78,7 +78,6 @@ static const filter_list_entry filter_list[] = {
 static unsigned int php_sapi_filter(int arg, char *var, char **val, unsigned int val_len, unsigned int *new_val_len TSRMLS_DC);
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_filter_input, 0, 0, 2)
        ZEND_ARG_INFO(0, type)
        ZEND_ARG_INFO(0, variable_name)
@@ -86,36 +85,30 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_filter_input, 0, 0, 2)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_filter_var, 0, 0, 1)
        ZEND_ARG_INFO(0, variable)
        ZEND_ARG_INFO(0, filter)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_filter_input_array, 0, 0, 1)
        ZEND_ARG_INFO(0, type)
        ZEND_ARG_INFO(0, definition)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_filter_var_array, 0, 0, 1)
        ZEND_ARG_INFO(0, data)
        ZEND_ARG_INFO(0, definition)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_filter_list, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_filter_has_var, 0, 0, 2)
        ZEND_ARG_INFO(0, type)
        ZEND_ARG_INFO(0, variable_name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_filter_id, 0, 0, 1)
        ZEND_ARG_INFO(0, filtername)
 ZEND_END_ARG_INFO()

diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c
index 86fdef8eea1f9ef1ce5c1926386e91f3adacfa35..6c3a76e73de9f7721e78e8047232f3ea43344d0b 100644 (file)
--- a/ext/ftp/php_ftp.c
+++ b/ext/ftp/php_ftp.c
@@ -45,7 +45,6 @@ static int    le_ftpbuf;
 #define le_ftpbuf_name "FTP Buffer"
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_connect, 0, 0, 1)
        ZEND_ARG_INFO(0, host)
        ZEND_ARG_INFO(0, port)
@@ -53,7 +52,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_connect, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 #if HAVE_OPENSSL_EXT
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_ssl_connect, 0, 0, 1)
        ZEND_ARG_INFO(0, host)
        ZEND_ARG_INFO(0, port)
@@ -61,86 +59,72 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_ssl_connect, 0, 0, 1)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ftp_login, 0)
        ZEND_ARG_INFO(0, ftp)
        ZEND_ARG_INFO(0, username)
        ZEND_ARG_INFO(0, password)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ftp_pwd, 0)
        ZEND_ARG_INFO(0, ftp)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ftp_cdup, 0)
        ZEND_ARG_INFO(0, ftp)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ftp_chdir, 0)
        ZEND_ARG_INFO(0, ftp)
        ZEND_ARG_INFO(0, directory)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ftp_exec, 0)
        ZEND_ARG_INFO(0, ftp)
        ZEND_ARG_INFO(0, command)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ftp_raw, 0)
        ZEND_ARG_INFO(0, ftp)
        ZEND_ARG_INFO(0, command)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ftp_mkdir, 0)
        ZEND_ARG_INFO(0, ftp)
        ZEND_ARG_INFO(0, directory)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ftp_rmdir, 0)
        ZEND_ARG_INFO(0, ftp)
        ZEND_ARG_INFO(0, directory)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ftp_chmod, 0)
        ZEND_ARG_INFO(0, ftp)
        ZEND_ARG_INFO(0, mode)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_alloc, 0, 0, 2)
        ZEND_ARG_INFO(0, ftp)
        ZEND_ARG_INFO(0, size)
        ZEND_ARG_INFO(1, response)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ftp_nlist, 0)
        ZEND_ARG_INFO(0, ftp)
        ZEND_ARG_INFO(0, directory)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_rawlist, 0, 0, 2)
        ZEND_ARG_INFO(0, ftp)
        ZEND_ARG_INFO(0, directory)
        ZEND_ARG_INFO(0, recursive)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ftp_systype, 0)
        ZEND_ARG_INFO(0, ftp)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_fget, 0, 0, 4)
        ZEND_ARG_INFO(0, ftp)
        ZEND_ARG_INFO(0, fp)
@@ -149,7 +133,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_fget, 0, 0, 4)
        ZEND_ARG_INFO(0, resumepos)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_nb_fget, 0, 0, 4)
        ZEND_ARG_INFO(0, ftp)
        ZEND_ARG_INFO(0, fp)
@@ -158,13 +141,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_nb_fget, 0, 0, 4)
        ZEND_ARG_INFO(0, resumepos)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ftp_pasv, 0)
        ZEND_ARG_INFO(0, ftp)
        ZEND_ARG_INFO(0, pasv)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_get, 0, 0, 4)
        ZEND_ARG_INFO(0, ftp)
        ZEND_ARG_INFO(0, local_file)
@@ -173,7 +154,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_get, 0, 0, 4)
        ZEND_ARG_INFO(0, resume_pos)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_nb_get, 0, 0, 4)
        ZEND_ARG_INFO(0, ftp)
        ZEND_ARG_INFO(0, local_file)
@@ -182,12 +162,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_nb_get, 0, 0, 4)
        ZEND_ARG_INFO(0, resume_pos)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ftp_nb_continue, 0)
        ZEND_ARG_INFO(0, ftp)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_fput, 0, 0, 4)
        ZEND_ARG_INFO(0, ftp)
        ZEND_ARG_INFO(0, remote_file)
@@ -196,7 +174,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_fput, 0, 0, 4)
        ZEND_ARG_INFO(0, startpos)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_nb_fput, 0, 0, 4)
        ZEND_ARG_INFO(0, ftp)
        ZEND_ARG_INFO(0, remote_file)
@@ -205,7 +182,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_nb_fput, 0, 0, 4)
        ZEND_ARG_INFO(0, startpos)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_put, 0, 0, 4)
        ZEND_ARG_INFO(0, ftp)
        ZEND_ARG_INFO(0, remote_file)
@@ -214,7 +190,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_put, 0, 0, 4)
        ZEND_ARG_INFO(0, startpos)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_nb_put, 0, 0, 4)
        ZEND_ARG_INFO(0, ftp)
        ZEND_ARG_INFO(0, remote_file)
@@ -223,50 +198,42 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_nb_put, 0, 0, 4)
        ZEND_ARG_INFO(0, startpos)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ftp_size, 0)
        ZEND_ARG_INFO(0, ftp)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ftp_mdtm, 0)
        ZEND_ARG_INFO(0, ftp)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ftp_rename, 0)
        ZEND_ARG_INFO(0, ftp)
        ZEND_ARG_INFO(0, src)
        ZEND_ARG_INFO(0, dest)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ftp_delete, 0)
        ZEND_ARG_INFO(0, ftp)
        ZEND_ARG_INFO(0, file)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ftp_site, 0)
        ZEND_ARG_INFO(0, ftp)
        ZEND_ARG_INFO(0, cmd)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ftp_close, 0)
        ZEND_ARG_INFO(0, ftp)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ftp_set_option, 0)
        ZEND_ARG_INFO(0, ftp)
        ZEND_ARG_INFO(0, option)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ftp_get_option, 0)
        ZEND_ARG_INFO(0, ftp)
        ZEND_ARG_INFO(0, option)

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index d1aeb009e59831ebb34ff78231f5e79eb767d42c..836d6877fd825859c3ae7319e812adfcda49bc12 100644 (file)
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -140,33 +140,27 @@ static void _php_image_convert(INTERNAL_FUNCTION_PARAMETERS, int image_type);
 static void _php_image_bw_convert(gdImagePtr im_org, gdIOCtx *out, int threshold);
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gd_info, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imageloadfont, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagesetstyle, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_ARRAY_INFO(0, styles, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecreatetruecolor, 0)
        ZEND_ARG_INFO(0, x_size)
        ZEND_ARG_INFO(0, y_size)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imageistruecolor, 0)
        ZEND_ARG_INFO(0, im)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagetruecolortopalette, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, ditherFlag)
@@ -174,20 +168,17 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagetruecolortopalette, 0)
 ZEND_END_ARG_INFO()
 
 #if HAVE_GD_BUNDLED
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecolormatch, 0)
        ZEND_ARG_INFO(0, im1)
        ZEND_ARG_INFO(0, im2)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagesetthickness, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, thickness)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagefilledellipse, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, cx)
@@ -197,7 +188,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagefilledellipse, 0)
        ZEND_ARG_INFO(0, color)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagefilledarc, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, cx)
@@ -210,27 +200,23 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagefilledarc, 0)
        ZEND_ARG_INFO(0, style)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagealphablending, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, blend)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagesavealpha, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, save)
 ZEND_END_ARG_INFO()
 
 #if HAVE_GD_BUNDLED
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagelayereffect, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, effect)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecolorallocatealpha, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, red)
@@ -239,7 +225,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecolorallocatealpha, 0)
        ZEND_ARG_INFO(0, alpha)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecolorresolvealpha, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, red)
@@ -248,7 +233,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecolorresolvealpha, 0)
        ZEND_ARG_INFO(0, alpha)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecolorclosestalpha, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, red)
@@ -257,7 +241,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecolorclosestalpha, 0)
        ZEND_ARG_INFO(0, alpha)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecolorexactalpha, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, red)
@@ -266,7 +249,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecolorexactalpha, 0)
        ZEND_ARG_INFO(0, alpha)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecopyresampled, 0)
        ZEND_ARG_INFO(0, dst_im)
        ZEND_ARG_INFO(0, src_im)
@@ -281,19 +263,16 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecopyresampled, 0)
 ZEND_END_ARG_INFO()
 
 #ifdef PHP_WIN32
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagegrabwindow, 0, 0, 1)
        ZEND_ARG_INFO(0, handle)
        ZEND_ARG_INFO(0, client_area)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagegrabscreen, 0)
 ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_GD_BUNDLED
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagerotate, 0, 0, 3)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, angle)
@@ -303,7 +282,6 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if HAVE_GD_IMAGESETTILE
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagesettile, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, tile)
@@ -311,79 +289,66 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if HAVE_GD_IMAGESETBRUSH
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagesetbrush, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, brush)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecreate, 0)
        ZEND_ARG_INFO(0, x_size)
        ZEND_ARG_INFO(0, y_size)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagetypes, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromstring, 0)
        ZEND_ARG_INFO(0, image)
 ZEND_END_ARG_INFO()
 
 #ifdef HAVE_GD_GIF_READ
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromgif, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_GD_JPG
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromjpeg, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_GD_PNG
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefrompng, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_GD_XBM
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromxbm, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 #endif
 
 #if defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED)
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromxpm, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromwbmp, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromgd, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromgd2, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromgd2part, 0)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, srcX)
@@ -393,7 +358,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromgd2part, 0)
 ZEND_END_ARG_INFO()
 
 #if HAVE_GD_BUNDLED
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagexbm, 0, 0, 2)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, filename)
@@ -402,7 +366,6 @@ ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_GD_GIF_CREATE
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagegif, 0, 0, 1)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, filename)
@@ -410,7 +373,6 @@ ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_GD_PNG
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagepng, 0, 0, 1)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, filename)
@@ -418,7 +380,6 @@ ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_GD_JPG
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagejpeg, 0, 0, 1)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, filename)
@@ -426,20 +387,17 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imagejpeg, 0, 0, 1)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagewbmp, 0, 0, 1)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, foreground)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagegd, 0, 0, 1)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagegd2, 0, 0, 1)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, filename)
@@ -447,12 +405,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imagegd2, 0, 0, 1)
        ZEND_ARG_INFO(0, type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagedestroy, 0)
        ZEND_ARG_INFO(0, im)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecolorallocate, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, red)
@@ -460,20 +416,17 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecolorallocate, 0)
        ZEND_ARG_INFO(0, blue)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagepalettecopy, 0)
        ZEND_ARG_INFO(0, dst)
        ZEND_ARG_INFO(0, src)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecolorat, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, x)
        ZEND_ARG_INFO(0, y)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecolorclosest, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, red)
@@ -482,7 +435,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecolorclosest, 0)
 ZEND_END_ARG_INFO()
 
 #if HAVE_COLORCLOSESTHWB
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecolorclosesthwb, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, red)
@@ -491,13 +443,11 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecolorclosesthwb, 0)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecolordeallocate, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecolorresolve, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, red)
@@ -505,7 +455,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecolorresolve, 0)
        ZEND_ARG_INFO(0, blue)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecolorexact, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, red)
@@ -513,7 +462,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecolorexact, 0)
        ZEND_ARG_INFO(0, blue)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecolorset, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, color)
@@ -522,20 +470,17 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecolorset, 0)
        ZEND_ARG_INFO(0, blue)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecolorsforindex, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagegammacorrect, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, inputgamma)
        ZEND_ARG_INFO(0, outputgamma)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagesetpixel, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, x)
@@ -543,7 +488,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagesetpixel, 0)
        ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imageline, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, x1)
@@ -553,7 +497,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_imageline, 0)
        ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagedashedline, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, x1)
@@ -563,7 +506,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagedashedline, 0)
        ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagerectangle, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, x1)
@@ -573,7 +515,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagerectangle, 0)
        ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagefilledrectangle, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, x1)
@@ -583,7 +524,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagefilledrectangle, 0)
        ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagearc, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, cx)
@@ -595,7 +535,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagearc, 0)
        ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imageellipse, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, cx)
@@ -605,7 +544,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_imageellipse, 0)
        ZEND_ARG_INFO(0, color)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagefilltoborder, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, x)
@@ -614,7 +552,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagefilltoborder, 0)
        ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagefill, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, x)
@@ -622,24 +559,20 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagefill, 0)
        ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecolorstotal, 0)
        ZEND_ARG_INFO(0, im)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagecolortransparent, 0, 0, 1)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imageinterlace, 0, 0, 1)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, interlace)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagepolygon, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_ARRAY_INFO(0, points, 0)
@@ -647,7 +580,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagepolygon, 0)
        ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagefilledpolygon, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_ARRAY_INFO(0, points, 0)
@@ -655,17 +587,14 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagefilledpolygon, 0)
        ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagefontwidth, 0)
        ZEND_ARG_INFO(0, font)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagefontheight, 0)
        ZEND_ARG_INFO(0, font)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagechar, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, font)
@@ -675,7 +604,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagechar, 0)
        ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecharup, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, font)
@@ -685,7 +613,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecharup, 0)
        ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagestring, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, font)
@@ -695,7 +622,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagestring, 0)
        ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagestringup, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, font)
@@ -705,7 +631,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagestringup, 0)
        ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecopy, 0)
        ZEND_ARG_INFO(0, dst_im)
        ZEND_ARG_INFO(0, src_im)
@@ -717,7 +642,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecopy, 0)
        ZEND_ARG_INFO(0, src_h)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecopymerge, 0)
        ZEND_ARG_INFO(0, src_im)
        ZEND_ARG_INFO(0, dst_im)
@@ -730,7 +654,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecopymerge, 0)
        ZEND_ARG_INFO(0, pct)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecopymergegray, 0)
        ZEND_ARG_INFO(0, src_im)
        ZEND_ARG_INFO(0, dst_im)
@@ -743,7 +666,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecopymergegray, 0)
        ZEND_ARG_INFO(0, pct)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagecopyresized, 0)
        ZEND_ARG_INFO(0, dst_im)
        ZEND_ARG_INFO(0, src_im)
@@ -757,19 +679,16 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecopyresized, 0)
        ZEND_ARG_INFO(0, src_h)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagesx, 0)
        ZEND_ARG_INFO(0, im)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagesy, 0)
        ZEND_ARG_INFO(0, im)
 ZEND_END_ARG_INFO()
 
 #ifdef ENABLE_GD_TTF
 #if HAVE_LIBFREETYPE && HAVE_GD_STRINGFTEX
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imageftbbox, 0, 0, 4)
        ZEND_ARG_INFO(0, size)
        ZEND_ARG_INFO(0, angle)
@@ -778,7 +697,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imageftbbox, 0, 0, 4)
        ZEND_ARG_ARRAY_INFO(0, extrainfo, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagefttext, 0, 0, 8)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, size)
@@ -792,7 +710,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imagefttext, 0, 0, 8)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagettfbbox, 0)
        ZEND_ARG_INFO(0, size)
        ZEND_ARG_INFO(0, angle)
@@ -800,7 +717,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagettfbbox, 0)
        ZEND_ARG_INFO(0, text)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagettftext, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, size)
@@ -814,42 +730,35 @@ ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_LIBT1
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagepsloadfont, 0)
        ZEND_ARG_INFO(0, pathname)
 ZEND_END_ARG_INFO()
 
 /*
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagepscopyfont, 0)
        ZEND_ARG_INFO(0, font_index)
 ZEND_END_ARG_INFO()
 */
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagepsfreefont, 0)
        ZEND_ARG_INFO(0, font_index)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagepsencodefont, 0)
        ZEND_ARG_INFO(0, font_index)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagepsextendfont, 0)
        ZEND_ARG_INFO(0, font_index)
        ZEND_ARG_INFO(0, extend)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imagepsslantfont, 0)
        ZEND_ARG_INFO(0, font_index)
        ZEND_ARG_INFO(0, slant)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagepstext, 0, 0, 8)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, text)
@@ -865,7 +774,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imagepstext, 0, 0, 8)
        ZEND_ARG_INFO(0, antialias)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagepsbbox, 0, 0, 3)
        ZEND_ARG_INFO(0, text)
        ZEND_ARG_INFO(0, font)
@@ -876,7 +784,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imagepsbbox, 0, 0, 3)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_image2wbmp, 0, 0, 1)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, filename)
@@ -884,7 +791,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_image2wbmp, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 #if defined(HAVE_GD_JPG)
-static
 ZEND_BEGIN_ARG_INFO(arginfo_jpeg2wbmp, 0)
        ZEND_ARG_INFO(0, f_org)
        ZEND_ARG_INFO(0, f_dest)
@@ -895,7 +801,6 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if defined(HAVE_GD_PNG)
-static
 ZEND_BEGIN_ARG_INFO(arginfo_png2wbmp, 0)
        ZEND_ARG_INFO(0, f_org)
        ZEND_ARG_INFO(0, f_dest)
@@ -906,7 +811,6 @@ ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_GD_BUNDLED
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imagefilter, 0, 0, 2)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, filtertype)
@@ -915,7 +819,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imagefilter, 0, 0, 2)
        ZEND_ARG_INFO(0, arg3)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imageconvolution, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_ARRAY_INFO(0, matrix3x3, 0)
@@ -925,7 +828,6 @@ ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_GD_BUNDLED
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imageantialias, 0)
        ZEND_ARG_INFO(0, im)
        ZEND_ARG_INFO(0, on)

diff --git a/ext/gettext/gettext.c b/ext/gettext/gettext.c
index 80282e0803f88abc3faadefe99160c09f57ee832..55e1c7ffee223755559aa9bd1468bb8ef90c2154 100644 (file)
--- a/ext/gettext/gettext.c
+++ b/ext/gettext/gettext.c
@@ -31,37 +31,31 @@
 #include "php_gettext.h"
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_textdomain, 0)
        ZEND_ARG_INFO(0, domain)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gettext, 0)
        ZEND_ARG_INFO(0, msgid)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dgettext, 0)
        ZEND_ARG_INFO(0, domain_name)
        ZEND_ARG_INFO(0, msgid)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dcgettext, 0)
        ZEND_ARG_INFO(0, domain_name)
        ZEND_ARG_INFO(0, msgid)
        ZEND_ARG_INFO(0, category)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_bindtextdomain, 0)
        ZEND_ARG_INFO(0, domain_name)
        ZEND_ARG_INFO(0, dir)
 ZEND_END_ARG_INFO()
 
 #if HAVE_NGETTEXT
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ngettext, 0)
        ZEND_ARG_INFO(0, msgid1)
        ZEND_ARG_INFO(0, msgid2)
@@ -70,7 +64,6 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if HAVE_DNGETTEXT
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dngettext, 0)
        ZEND_ARG_INFO(0, domain)
        ZEND_ARG_INFO(0, msgid1)
@@ -80,7 +73,6 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if HAVE_DCNGETTEXT
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dcngettext, 0)
        ZEND_ARG_INFO(0, domain)
        ZEND_ARG_INFO(0, msgid1)
@@ -91,7 +83,6 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if HAVE_BIND_TEXTDOMAIN_CODESET
-static
 ZEND_BEGIN_ARG_INFO(arginfo_bind_textdomain_codeset, 0)
        ZEND_ARG_INFO(0, domain)
        ZEND_ARG_INFO(0, codeset)

diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c
index 9e83e1109af48023c28f8e316076912fdd2fb32a..df3bd7d8cb694def04d1bbfdd30eae7254df3222 100644 (file)
--- a/ext/gmp/gmp.c
+++ b/ext/gmp/gmp.c
@@ -38,234 +38,194 @@
 static int le_gmp;
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_init, 0, 0, 1)
        ZEND_ARG_INFO(0, number)
        ZEND_ARG_INFO(0, base)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_intval, 0)
        ZEND_ARG_INFO(0, gmpnumber)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_strval, 0, 0, 1)
        ZEND_ARG_INFO(0, gmpnumber)
        ZEND_ARG_INFO(0, base)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_add, 0)
        ZEND_ARG_INFO(0, a)
        ZEND_ARG_INFO(0, b)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_sub, 0)
        ZEND_ARG_INFO(0, a)
        ZEND_ARG_INFO(0, b)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_mul, 0)
        ZEND_ARG_INFO(0, a)
        ZEND_ARG_INFO(0, b)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_div_qr, 0, 0, 2)
        ZEND_ARG_INFO(0, a)
        ZEND_ARG_INFO(0, b)
        ZEND_ARG_INFO(0, round)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_div_r, 0, 0, 2)
        ZEND_ARG_INFO(0, a)
        ZEND_ARG_INFO(0, b)
        ZEND_ARG_INFO(0, round)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_div_q, 0, 0, 2)
        ZEND_ARG_INFO(0, a)
        ZEND_ARG_INFO(0, b)
        ZEND_ARG_INFO(0, round)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_mod, 0)
        ZEND_ARG_INFO(0, a)
        ZEND_ARG_INFO(0, b)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_divexact, 0)
        ZEND_ARG_INFO(0, a)
        ZEND_ARG_INFO(0, b)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_neg, 0)
        ZEND_ARG_INFO(0, a)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_abs, 0)
        ZEND_ARG_INFO(0, a)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_fact, 0)
        ZEND_ARG_INFO(0, a)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_pow, 0)
        ZEND_ARG_INFO(0, base)
        ZEND_ARG_INFO(0, exp)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_powm, 0)
        ZEND_ARG_INFO(0, base)
        ZEND_ARG_INFO(0, exp)
        ZEND_ARG_INFO(0, mod)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_sqrt, 0)
        ZEND_ARG_INFO(0, a)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_sqrtrem, 0)
        ZEND_ARG_INFO(0, a)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_perfect_square, 0)
        ZEND_ARG_INFO(0, a)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_prob_prime, 0, 0, 1)
        ZEND_ARG_INFO(0, a)
        ZEND_ARG_INFO(0, reps)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_gcd, 0)
        ZEND_ARG_INFO(0, a)
        ZEND_ARG_INFO(0, b)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_gcdext, 0)
        ZEND_ARG_INFO(0, a)
        ZEND_ARG_INFO(0, b)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_invert, 0)
        ZEND_ARG_INFO(0, a)
        ZEND_ARG_INFO(0, b)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_jacobi, 0)
        ZEND_ARG_INFO(0, a)
        ZEND_ARG_INFO(0, b)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_legendre, 0)
        ZEND_ARG_INFO(0, a)
        ZEND_ARG_INFO(0, b)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_cmp, 0)
        ZEND_ARG_INFO(0, a)
        ZEND_ARG_INFO(0, b)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_sign, 0)
        ZEND_ARG_INFO(0, a)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_random, 0, 0, 0)
        ZEND_ARG_INFO(0, limiter)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_and, 0)
        ZEND_ARG_INFO(0, a)
        ZEND_ARG_INFO(0, b)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_or, 0)
        ZEND_ARG_INFO(0, a)
        ZEND_ARG_INFO(0, b)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_com, 0)
        ZEND_ARG_INFO(0, a)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_nextprime, 0)
        ZEND_ARG_INFO(0, a)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_xor, 0)
        ZEND_ARG_INFO(0, a)
        ZEND_ARG_INFO(0, b)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_setbit, 0, 0, 2)
        ZEND_ARG_INFO(1, a)
        ZEND_ARG_INFO(0, index)
        ZEND_ARG_INFO(0, set_clear)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_clrbit, 0)
        ZEND_ARG_INFO(1, a)
        ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
 
-       static
-ZEND_BEGIN_ARG_INFO(arginfo_gmp_testbit, 0)
+       ZEND_BEGIN_ARG_INFO(arginfo_gmp_testbit, 0)
        ZEND_ARG_INFO(0, a)
        ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_popcount, 0)
        ZEND_ARG_INFO(0, a)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_hamdist, 0)
        ZEND_ARG_INFO(0, a)
        ZEND_ARG_INFO(0, b)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_scan0, 0)
        ZEND_ARG_INFO(0, a)
        ZEND_ARG_INFO(0, start)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gmp_scan1, 0)
        ZEND_ARG_INFO(0, a)
        ZEND_ARG_INFO(0, start)

diff --git a/ext/hash/hash.c b/ext/hash/hash.c
index 54baadc20eef640e778ccbed731a654a03d7e910..79d53cbc80e9e02dad8dc3364cc7ac2659774884 100644 (file)
--- a/ext/hash/hash.c
+++ b/ext/hash/hash.c
@@ -1061,21 +1061,18 @@ PHP_MINFO_FUNCTION(hash)
 
 /* {{{ arginfo */
 #if PHP_MAJOR_VERSION >= 5
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_hash, 0, 0, 2)
        ZEND_ARG_INFO(0, algo)
        ZEND_ARG_INFO(0, data)
        ZEND_ARG_INFO(0, raw_output)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_file, 0, 0, 2)
        ZEND_ARG_INFO(0, algo)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, raw_output)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_hmac, 0, 0, 3)
        ZEND_ARG_INFO(0, algo)
        ZEND_ARG_INFO(0, data)
@@ -1083,7 +1080,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_hmac, 0, 0, 3)
        ZEND_ARG_INFO(0, raw_output)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_hmac_file, 0, 0, 3)
        ZEND_ARG_INFO(0, algo)
        ZEND_ARG_INFO(0, filename)
@@ -1091,61 +1087,51 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_hmac_file, 0, 0, 3)
        ZEND_ARG_INFO(0, raw_output)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_init, 0, 0, 1)
        ZEND_ARG_INFO(0, algo)
        ZEND_ARG_INFO(0, options)
        ZEND_ARG_INFO(0, key)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_hash_update, 0)
        ZEND_ARG_INFO(0, context)
        ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_update_stream, 0, 0, 2)
        ZEND_ARG_INFO(0, context)
        ZEND_ARG_INFO(0, handle)
        ZEND_ARG_INFO(0, length)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_update_file, 0, 0, 2)
        ZEND_ARG_INFO(0, context)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, context)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_hash_final, 0, 0, 1)
        ZEND_ARG_INFO(0, context)
        ZEND_ARG_INFO(0, raw_output)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_hash_copy, 0)
        ZEND_ARG_INFO(0, context)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_hash_algos, 0)
 ZEND_END_ARG_INFO()
 
 /* BC Land */
 #ifdef PHP_MHASH_BC
-static
 ZEND_BEGIN_ARG_INFO(arginfo_mhash_get_block_size, 0)
        ZEND_ARG_INFO(0, hash)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_mhash_get_hash_name, 0)
        ZEND_ARG_INFO(0, hash)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_mhash_keygen_s2k, 0)
        ZEND_ARG_INFO(0, hash)
        ZEND_ARG_INFO(0, input_password)
@@ -1153,11 +1139,9 @@ ZEND_BEGIN_ARG_INFO(arginfo_mhash_keygen_s2k, 0)
        ZEND_ARG_INFO(0, bytes)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_mhash_count, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mhash, 0, 0, 2)
        ZEND_ARG_INFO(0, hash)
        ZEND_ARG_INFO(0, data)

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 6c4c4acbae75657f8026f551abc84bc49bfbd5d9..ab4999a2800b5ed57d6144d90005a2498d150f3d 100644 (file)
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -63,13 +63,11 @@
   ((c) == sizeof(unsigned long) ? *((unsigned long *)(a)) == *((unsigned long *)(b)) : ((c) == sizeof(unsigned int) ? *((unsigned int *)(a)) == *((unsigned int *)(b)) : memcmp(a, b, c) == 0))
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_iconv_strlen, 0, 0, 1)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, charset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_iconv_substr, 0, 0, 2)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, offset)
@@ -77,7 +75,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_iconv_substr, 0, 0, 2)
        ZEND_ARG_INFO(0, charset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_iconv_strpos, 0, 0, 2)
        ZEND_ARG_INFO(0, haystack)
        ZEND_ARG_INFO(0, needle)
@@ -85,48 +82,41 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_iconv_strpos, 0, 0, 2)
        ZEND_ARG_INFO(0, charset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_iconv_strrpos, 0, 0, 2)
        ZEND_ARG_INFO(0, haystack)
        ZEND_ARG_INFO(0, needle)
        ZEND_ARG_INFO(0, charset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_iconv_mime_encode, 0, 0, 2)
        ZEND_ARG_INFO(0, field_name)
        ZEND_ARG_INFO(0, field_value)
        ZEND_ARG_INFO(0, preference) /* ZEND_ARG_ARRAY_INFO(0, preference, 1) */
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_iconv_mime_decode, 0, 0, 1)
        ZEND_ARG_INFO(0, encoded_string)
        ZEND_ARG_INFO(0, mode)
        ZEND_ARG_INFO(0, charset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_iconv_mime_decode_headers, 0, 0, 1)
        ZEND_ARG_INFO(0, headers)
        ZEND_ARG_INFO(0, mode)
        ZEND_ARG_INFO(0, charset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_iconv, 0)
        ZEND_ARG_INFO(0, in_charset)
        ZEND_ARG_INFO(0, out_charset)
        ZEND_ARG_INFO(0, str)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_iconv_set_encoding, 0)
        ZEND_ARG_INFO(0, type)
        ZEND_ARG_INFO(0, charset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_iconv_get_encoding, 0, 0, 0)
        ZEND_ARG_INFO(0, type)
 ZEND_END_ARG_INFO()

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 470f523d8e93dd40bb7566e3852f49154d1ee73a..67d0fedf042a0612eab938a39df2748836c4b3cf 100644 (file)
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -99,7 +99,6 @@ ZEND_DECLARE_MODULE_GLOBALS(imap)
 static PHP_GINIT_FUNCTION(imap);
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_open, 0, 0, 3)
        ZEND_ARG_INFO(0, mailbox)
        ZEND_ARG_INFO(0, user)
@@ -108,7 +107,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_open, 0, 0, 3)
        ZEND_ARG_INFO(0, n_retries)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_reopen, 0, 0, 2)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, mailbox)
@@ -116,7 +114,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_reopen, 0, 0, 2)
        ZEND_ARG_INFO(0, n_retries)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_append, 0, 0, 3)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, folder)
@@ -124,42 +121,35 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_append, 0, 0, 3)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_num_msg, 0, 0, 1)
        ZEND_ARG_INFO(0, stream_id)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_ping, 0, 0, 1)
        ZEND_ARG_INFO(0, stream_id)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_num_recent, 0, 0, 1)
        ZEND_ARG_INFO(0, stream_id)
 ZEND_END_ARG_INFO()
 
 #if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_get_quota, 0, 0, 2)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, qroot)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_get_quotaroot, 0, 0, 2)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, mbox)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_set_quota, 0, 0, 3)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, qroot)
        ZEND_ARG_INFO(0, mailbox_size)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_setacl, 0, 0, 4)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, mailbox)
@@ -167,37 +157,31 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_setacl, 0, 0, 4)
        ZEND_ARG_INFO(0, rights)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_getacl, 0, 0, 2)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, mailbox)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_expunge, 0, 0, 1)
        ZEND_ARG_INFO(0, stream_id)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_close, 0, 0, 1)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_headers, 0, 0, 1)
        ZEND_ARG_INFO(0, stream_id)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_body, 0, 0, 2)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, msg_no)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_mail_copy, 0, 0, 3)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, msglist)
@@ -205,7 +189,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_mail_copy, 0, 0, 3)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_mail_move, 0, 0, 3)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, sequence)
@@ -213,40 +196,34 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_mail_move, 0, 0, 3)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_createmailbox, 0, 0, 2)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, mailbox)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_renamemailbox, 0, 0, 3)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, old_name)
        ZEND_ARG_INFO(0, new_name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_deletemailbox, 0, 0, 2)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, mailbox)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_list, 0, 0, 3)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, ref)
        ZEND_ARG_INFO(0, pattern)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_getmailboxes, 0, 0, 3)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, ref)
        ZEND_ARG_INFO(0, pattern)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_listscan, 0, 0, 4)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, ref)
@@ -254,26 +231,22 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_listscan, 0, 0, 4)
        ZEND_ARG_INFO(0, content)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_check, 0, 0, 1)
        ZEND_ARG_INFO(0, stream_id)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_delete, 0, 0, 2)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, msg_no)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_undelete, 0, 0, 2)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, msg_no)
        ZEND_ARG_INFO(0, flags)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_headerinfo, 0, 0, 2)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, msg_no)
@@ -282,46 +255,39 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_headerinfo, 0, 0, 2)
        ZEND_ARG_INFO(0, default_host)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_rfc822_parse_headers, 0, 0, 1)
        ZEND_ARG_INFO(0, headers)
        ZEND_ARG_INFO(0, default_host)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_lsub, 0, 0, 3)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, ref)
        ZEND_ARG_INFO(0, pattern)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_getsubscribed, 0, 0, 3)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, ref)
        ZEND_ARG_INFO(0, pattern)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_subscribe, 0, 0, 2)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, mailbox)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_unsubscribe, 0, 0, 2)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, mailbox)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_fetchstructure, 0, 0, 2)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, msg_no)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_fetchbody, 0, 0, 3)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, msg_no)
@@ -329,7 +295,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_fetchbody, 0, 0, 3)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_savebody, 0, 0, 3)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, file)
@@ -338,60 +303,49 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_savebody, 0, 0, 3)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_base64, 0, 0, 1)
        ZEND_ARG_INFO(0, text)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_qprint, 0, 0, 1)
        ZEND_ARG_INFO(0, text)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_8bit, 0, 0, 1)
        ZEND_ARG_INFO(0, text)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_binary, 0, 0, 1)
        ZEND_ARG_INFO(0, text)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_mailboxmsginfo, 0, 0, 1)
        ZEND_ARG_INFO(0, stream_id)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_rfc822_write_address, 0, 0, 3)
        ZEND_ARG_INFO(0, mailbox)
        ZEND_ARG_INFO(0, host)
        ZEND_ARG_INFO(0, personal)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_rfc822_parse_adrlist, 0, 0, 2)
        ZEND_ARG_INFO(0, address_string)
        ZEND_ARG_INFO(0, default_host)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_utf8, 0, 0, 1)
        ZEND_ARG_INFO(0, mime_encoded_text)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_utf7_decode, 0, 0, 1)
        ZEND_ARG_INFO(0, buf)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_utf7_encode, 0, 0, 1)
        ZEND_ARG_INFO(0, buf)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_setflag_full, 0, 0, 3)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, sequence)
@@ -399,7 +353,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_setflag_full, 0, 0, 3)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_clearflag_full, 0, 0, 3)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, sequence)
@@ -407,7 +360,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_clearflag_full, 0, 0, 3)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_sort, 0, 0, 3)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, criteria)
@@ -417,53 +369,45 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_sort, 0, 0, 3)
        ZEND_ARG_INFO(0, charset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_fetchheader, 0, 0, 2)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, msg_no)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_uid, 0, 0, 2)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, msg_no)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_msgno, 0, 0, 2)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, unique_msg_id)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_status, 0, 0, 3)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, mailbox)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_bodystruct, 0, 0, 3)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, msg_no)
        ZEND_ARG_INFO(0, section)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_fetch_overview, 0, 0, 2)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, sequence)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_mail_compose, 0, 0, 2)
        ZEND_ARG_INFO(0, envelope)
        ZEND_ARG_INFO(0, body)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_mail, 0, 0, 3)
        ZEND_ARG_INFO(0, to)
        ZEND_ARG_INFO(0, subject)
@@ -474,7 +418,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_mail, 0, 0, 3)
        ZEND_ARG_INFO(0, rpath)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_search, 0, 0, 2)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, criteria)
@@ -482,30 +425,24 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_search, 0, 0, 2)
        ZEND_ARG_INFO(0, charset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imap_alerts, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imap_errors, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_imap_last_error, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_mime_header_decode, 0, 0, 1)
        ZEND_ARG_INFO(0, str)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_thread, 0, 0, 1)
        ZEND_ARG_INFO(0, stream_id)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_timeout, 0, 0, 1)
        ZEND_ARG_INFO(0, timeout_type)
        ZEND_ARG_INFO(0, timeout)

diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
index 1382c306ff8c8212a29f84d7e9fcb9328a7c91c9..0f20583bd6af98ea53761b0d07ab45659e106836 100644 (file)
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@ -47,15 +47,12 @@ ZEND_DECLARE_MODULE_GLOBALS(ibase)
 static PHP_GINIT_FUNCTION(ibase);
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ibase_errmsg, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ibase_errcode, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_connect, 0, 0, 1)
        ZEND_ARG_INFO(0, database)
        ZEND_ARG_INFO(0, username)
@@ -66,7 +63,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_connect, 0, 0, 1)
        ZEND_ARG_INFO(0, role)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_pconnect, 0, 0, 1)
        ZEND_ARG_INFO(0, database)
        ZEND_ARG_INFO(0, username)
@@ -77,17 +73,14 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_pconnect, 0, 0, 1)
        ZEND_ARG_INFO(0, role)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_close, 0, 0, 0)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_drop_db, 0, 0, 0)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_trans, 0, 0, 0)
        ZEND_ARG_INFO(0, trans_args)
        ZEND_ARG_INFO(0, link_identifier)
@@ -95,85 +88,70 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_trans, 0, 0, 0)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_commit, 0, 0, 1)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_rollback, 0, 0, 1)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_commit_ret, 0, 0, 1)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_rollback_ret, 0, 0, 1)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_gen_id, 0, 0, 1)
        ZEND_ARG_INFO(0, generator)
        ZEND_ARG_INFO(0, increment)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_create, 0, 0, 0)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_open, 0, 0, 0)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, blob_id)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_add, 0, 0, 2)
        ZEND_ARG_INFO(0, blob_handle)
        ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_get, 0, 0, 2)
        ZEND_ARG_INFO(0, blob_handle)
        ZEND_ARG_INFO(0, len)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_close, 0, 0, 1)
        ZEND_ARG_INFO(0, blob_handle)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_cancel, 0, 0, 1)
        ZEND_ARG_INFO(0, blob_handle)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_info, 0, 0, 0)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, blob_id)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_echo, 0, 0, 0)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, blob_id)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_blob_import, 0, 0, 0)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, file)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_query, 0, 0, 0)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, link_identifier)
@@ -182,88 +160,73 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_query, 0, 0, 0)
        ZEND_ARG_INFO(0, bind_arg)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_affected_rows, 0, 0, 0)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
 #if abies_0
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_num_rows, 0, 0, 1)
        ZEND_ARG_INFO(0, result_identifier)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_fetch_row, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, fetch_flags)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_fetch_assoc, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, fetch_flags)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_fetch_object, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, fetch_flags)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_name_result, 0, 0, 2)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_free_result, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_prepare, 0, 0, 0)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, query)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_execute, 0, 0, 1)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_INFO(0, bind_arg)
        ZEND_ARG_INFO(0, bind_arg)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_free_query, 0, 0, 1)
        ZEND_ARG_INFO(0, query)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_num_fields, 0, 0, 1)
        ZEND_ARG_INFO(0, query_result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_field_info, 0, 0, 2)
        ZEND_ARG_INFO(0, query_result)
        ZEND_ARG_INFO(0, field_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_num_params, 0, 0, 1)
        ZEND_ARG_INFO(0, query)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_param_info, 0, 0, 2)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_INFO(0, field_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_add_user, 0, 0, 3)
        ZEND_ARG_INFO(0, service_handle)
        ZEND_ARG_INFO(0, user_name)
@@ -273,7 +236,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_add_user, 0, 0, 3)
        ZEND_ARG_INFO(0, last_name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_modify_user, 0, 0, 3)
        ZEND_ARG_INFO(0, service_handle)
        ZEND_ARG_INFO(0, user_name)
@@ -283,7 +245,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_modify_user, 0, 0, 3)
        ZEND_ARG_INFO(0, last_name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_delete_user, 0, 0, 3)
        ZEND_ARG_INFO(0, service_handle)
        ZEND_ARG_INFO(0, user_name)
@@ -293,19 +254,16 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_delete_user, 0, 0, 3)
        ZEND_ARG_INFO(0, last_name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_service_attach, 0, 0, 3)
        ZEND_ARG_INFO(0, host)
        ZEND_ARG_INFO(0, dba_username)
        ZEND_ARG_INFO(0, dba_password)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_service_detach, 0, 0, 1)
        ZEND_ARG_INFO(0, service_handle)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_backup, 0, 0, 3)
        ZEND_ARG_INFO(0, service_handle)
        ZEND_ARG_INFO(0, source_db)
@@ -314,7 +272,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_backup, 0, 0, 3)
        ZEND_ARG_INFO(0, verbose)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_restore, 0, 0, 3)
        ZEND_ARG_INFO(0, service_handle)
        ZEND_ARG_INFO(0, source_file)
@@ -323,7 +280,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_restore, 0, 0, 3)
        ZEND_ARG_INFO(0, verbose)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_maintain_db, 0, 0, 3)
        ZEND_ARG_INFO(0, service_handle)
        ZEND_ARG_INFO(0, db)
@@ -331,7 +287,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_maintain_db, 0, 0, 3)
        ZEND_ARG_INFO(0, argument)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_db_info, 0, 0, 3)
        ZEND_ARG_INFO(0, service_handle)
        ZEND_ARG_INFO(0, db)
@@ -339,20 +294,17 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_db_info, 0, 0, 3)
        ZEND_ARG_INFO(0, argument)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_server_info, 0, 0, 2)
        ZEND_ARG_INFO(0, service_handle)
        ZEND_ARG_INFO(0, action)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_wait_event, 0, 0, 1)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, event)
        ZEND_ARG_INFO(0, event2)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_set_event_handler, 0, 0, 2)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, handler)
@@ -360,7 +312,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_set_event_handler, 0, 0, 2)
        ZEND_ARG_INFO(0, event2)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ibase_free_event_handler, 0, 0, 1)
        ZEND_ARG_INFO(0, event)
 ZEND_END_ARG_INFO()

diff --git a/ext/intl/collator/collator_class.c b/ext/intl/collator/collator_class.c
index ae83a82f92bd964f9bfdf426b11280bb2ccd28aa..c7e40c6c938cf546790a8d4950a78e258fe86261 100755 (executable)
--- a/ext/intl/collator/collator_class.c
+++ b/ext/intl/collator/collator_class.c
@@ -89,22 +89,18 @@ zend_object_value Collator_object_create(
        the procedural API.
 */
 
-static
 ZEND_BEGIN_ARG_INFO_EX( collator_0_args, 0, 0, 0 )
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX( collator_1_arg, 0, 0, 1 )
        ZEND_ARG_INFO( 0, arg1 )
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX( collator_2_args, 0, 0, 2 )
        ZEND_ARG_INFO( 0, arg1 )
        ZEND_ARG_INFO( 0, arg2 )
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX( collator_sort_args, 0, 0, 1 )
        ZEND_ARG_ARRAY_INFO( 1, arr, 0 )
        ZEND_ARG_INFO( 0, flags )

diff --git a/ext/intl/dateformat/dateformat_class.c b/ext/intl/dateformat/dateformat_class.c
index 407f00356e2563a1c7002793430b5ed3ab82e397..14cee7d18412dfe52dea2f4ac72c3f2169e11448 100755 (executable)
--- a/ext/intl/dateformat/dateformat_class.c
+++ b/ext/intl/dateformat/dateformat_class.c
@@ -84,42 +84,35 @@ zend_object_value IntlDateFormatter_object_create(zend_class_entry *ce TSRMLS_DC
  */
 
 /* {{{ arginfo */
-static ZEND_BEGIN_ARG_INFO_EX( datefmt_parse_args, 0, 0, 1 )
+ZEND_BEGIN_ARG_INFO_EX( datefmt_parse_args, 0, 0, 1 )
                ZEND_ARG_INFO( 0, string )
                ZEND_ARG_INFO( 1, position )
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_intldateformatter_format, 0, 0, 0)
        ZEND_ARG_INFO(0, args)
        ZEND_ARG_INFO(0, array)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_intldateformatter_getdatetype, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_intldateformatter_settimezoneid, 0, 0, 1)
        ZEND_ARG_INFO(0, zone)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_intldateformatter_setpattern, 0, 0, 1)
        ZEND_ARG_INFO(0, pattern)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_intldateformatter_setlenient, 0, 0, 1)
        ZEND_ARG_INFO(0, lenient)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_intldateformatter_setcalendar, 0, 0, 1)
        ZEND_ARG_INFO(0, which)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_intldateformatter___construct, 0, 0, 3)
        ZEND_ARG_INFO(0, locale)
        ZEND_ARG_INFO(0, datetype)

diff --git a/ext/intl/formatter/formatter_class.c b/ext/intl/formatter/formatter_class.c
index e2b8aef3cd047ea56643079af65c9e8ed49850d2..1abf266b4a0a58bb288cc27504cf296e9441fd94 100755 (executable)
--- a/ext/intl/formatter/formatter_class.c
+++ b/ext/intl/formatter/formatter_class.c
@@ -80,68 +80,58 @@ zend_object_value NumberFormatter_object_create(
  */
 
 /* {{{ arginfo */
-static ZEND_BEGIN_ARG_INFO_EX( number_parse_arginfo, 0, 0, 1 )
+ZEND_BEGIN_ARG_INFO_EX( number_parse_arginfo, 0, 0, 1 )
        ZEND_ARG_INFO( 0, string )
        ZEND_ARG_INFO( 0, type )
        ZEND_ARG_INFO( 1, position )
 ZEND_END_ARG_INFO()
 
-static ZEND_BEGIN_ARG_INFO_EX( number_parse_currency_arginfo, 0, 0, 2 )
+ZEND_BEGIN_ARG_INFO_EX( number_parse_currency_arginfo, 0, 0, 2 )
        ZEND_ARG_INFO( 0, string )
        ZEND_ARG_INFO( 1, currency )
        ZEND_ARG_INFO( 1, position )
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_numberformatter_getattribute, 0, 0, 1)
        ZEND_ARG_INFO(0, attr)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_numberformatter_setattribute, 0, 0, 2)
        ZEND_ARG_INFO(0, attr)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_numberformatter_getsymbol, 0, 0, 1)
        ZEND_ARG_INFO(0, attr)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_numberformatter_setsymbol, 0, 0, 2)
        ZEND_ARG_INFO(0, attr)
        ZEND_ARG_INFO(0, symbol)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_numberformatter_getpattern, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_numberformatter_setpattern, 0, 0, 1)
        ZEND_ARG_INFO(0, pattern)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_numberformatter_getlocale, 0, 0, 0)
        ZEND_ARG_INFO(0, type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_numberformatter___construct, 0, 0, 2)
        ZEND_ARG_INFO(0, locale)
        ZEND_ARG_INFO(0, style)
        ZEND_ARG_INFO(0, pattern)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_numberformatter_formatcurrency, 0, 0, 2)
        ZEND_ARG_INFO(0, num)
        ZEND_ARG_INFO(0, currency)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_numberformatter_format, 0, 0, 1)
        ZEND_ARG_INFO(0, num)
        ZEND_ARG_INFO(0, type)

diff --git a/ext/intl/locale/locale_class.c b/ext/intl/locale/locale_class.c
index 7814eb48ca0a83b935c7c03a79e2e51bb0d3fcae..8a9efbd832f997a24ab0efedf041a68aace5c3c6 100755 (executable)
--- a/ext/intl/locale/locale_class.c
+++ b/ext/intl/locale/locale_class.c
@@ -35,29 +35,24 @@ zend_class_entry *Locale_ce_ptr = NULL;
  *        approptiate 'locale_XX_args' for the procedural API!
  */
 
-static
 ZEND_BEGIN_ARG_INFO_EX( locale_0_args, 0, 0, 0 )
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX( locale_1_arg, 0, 0, 1 )
        ZEND_ARG_INFO( 0, arg1 )
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX( locale_2_args, 0, 0, 2 )
        ZEND_ARG_INFO( 0, arg1 )
        ZEND_ARG_INFO( 0, arg2 )
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX( locale_3_args, 0, 0, 3 )
         ZEND_ARG_INFO( 0, arg1 )
         ZEND_ARG_INFO( 0, arg2 )
         ZEND_ARG_INFO( 0, arg3 )
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX( locale_4_args, 0, 0, 4 )
         ZEND_ARG_INFO( 0, arg1 )
         ZEND_ARG_INFO( 0, arg2 )

diff --git a/ext/intl/msgformat/msgformat_class.c b/ext/intl/msgformat/msgformat_class.c
index 63af20b5eb22e8ea50bfa02c7b6a5b37fb776c0f..b710ee708627bf8550117d48e15236f53cbe9a25 100755 (executable)
--- a/ext/intl/msgformat/msgformat_class.c
+++ b/ext/intl/msgformat/msgformat_class.c
@@ -77,34 +77,28 @@ zend_object_value MessageFormatter_object_create(zend_class_entry *ce TSRMLS_DC)
  */
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_messageformatter___construct, 0, 0, 2)
        ZEND_ARG_INFO(0, locale)
        ZEND_ARG_INFO(0, pattern)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_messageformatter_geterrormessage, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_messageformatter_formatmessage, 0, 0, 3)
        ZEND_ARG_INFO(0, locale)
        ZEND_ARG_INFO(0, pattern)
        ZEND_ARG_INFO(0, args)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_messageformatter_format, 0, 0, 1)
        ZEND_ARG_INFO(0, args)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_messageformatter_setpattern, 0, 0, 1)
        ZEND_ARG_INFO(0, pattern)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_messageformatter_parse, 0, 0, 1)
        ZEND_ARG_INFO(0, source)
 ZEND_END_ARG_INFO()

diff --git a/ext/intl/normalizer/normalizer_class.c b/ext/intl/normalizer/normalizer_class.c
index 6a774ab5fbbc498665c1ae78cddf166227dc6dd6..75894fffc3744c5120800f81a81db0beb0c418ca 100755 (executable)
--- a/ext/intl/normalizer/normalizer_class.c
+++ b/ext/intl/normalizer/normalizer_class.c
@@ -29,7 +29,6 @@ zend_class_entry *Normalizer_ce_ptr = NULL;
 
 /* {{{ Normalizer methods arguments info */
 
-static
 ZEND_BEGIN_ARG_INFO_EX( normalizer_3_args, 0, 0, 3 )
        ZEND_ARG_INFO( 0, arg1 )
        ZEND_ARG_INFO( 0, arg2 )

diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c
index 8ba4faeea710ae7cbe67249a3ccbd4268e0026cb..d18fd0f64d74f670ab5ba47725f78b66e2d5323b 100755 (executable)
--- a/ext/intl/php_intl.c
+++ b/ext/intl/php_intl.c
@@ -75,47 +75,39 @@
 ZEND_DECLARE_MODULE_GLOBALS( intl )
 
 /* {{{ Arguments info */
-static
 ZEND_BEGIN_ARG_INFO_EX(collator_static_0_args, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(collator_static_1_arg, 0, 0, 1)
        ZEND_ARG_INFO(0, arg1)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(collator_static_2_args, 0, 0, 2)
        ZEND_ARG_INFO(0, arg1)
        ZEND_ARG_INFO(0, arg2)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(collator_0_args, 0, 0, 1)
        ZEND_ARG_OBJ_INFO(0, object, Collator, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(collator_1_arg, 0, 0, 2)
        ZEND_ARG_OBJ_INFO(0, object, Collator, 0)
        ZEND_ARG_INFO(0, arg1)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(collator_2_args, 0, 0, 3)
        ZEND_ARG_OBJ_INFO(0, object, Collator, 0)
        ZEND_ARG_INFO(0, arg1)
        ZEND_ARG_INFO(0, arg2)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(collator_sort_args, 0, 0, 2)
        ZEND_ARG_OBJ_INFO(0, object, Collator, 0)
        ZEND_ARG_ARRAY_INFO(1, arr, 0)
        ZEND_ARG_INFO(0, sort_flags)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(numfmt_parse_arginfo, 0, 0, 2)
        ZEND_ARG_INFO(0, formatter)
        ZEND_ARG_INFO(0, string)
@@ -123,7 +115,6 @@ ZEND_BEGIN_ARG_INFO_EX(numfmt_parse_arginfo, 0, 0, 2)
        ZEND_ARG_INFO(1, position)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(numfmt_parse_currency_arginfo, 0, 0, 3)
        ZEND_ARG_INFO(0, formatter)
        ZEND_ARG_INFO(0, string)
@@ -131,35 +122,29 @@ ZEND_BEGIN_ARG_INFO_EX(numfmt_parse_currency_arginfo, 0, 0, 3)
        ZEND_ARG_INFO(1, position)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(locale_0_args, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(locale_1_arg, 0, 0, 1)
        ZEND_ARG_INFO(0, arg1)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(locale_2_args, 0, 0, 2)
        ZEND_ARG_INFO(0, arg1)
        ZEND_ARG_INFO(0, arg2)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(locale_get_args, 0, 0, 1)
        ZEND_ARG_INFO(0, locale)
        ZEND_ARG_INFO(0, in_locale)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(locale_filter_args, 0, 0, 3)
        ZEND_ARG_INFO(0, langtag)
        ZEND_ARG_INFO(0, range)
        ZEND_ARG_INFO(0, canonical)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(locale_lookup_args, 0, 0, 3)
        ZEND_ARG_INFO(0, langtag)
        ZEND_ARG_INFO(0, locale)
@@ -171,39 +156,33 @@ ZEND_END_ARG_INFO()
 #define intl_0_args collator_static_0_args
 #define intl_1_arg collator_static_1_arg
 
-static
 ZEND_BEGIN_ARG_INFO_EX(normalizer_args, 0, 0, 1)
        ZEND_ARG_INFO(0, input)
        ZEND_ARG_INFO(0, form)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(grapheme_1_arg, 0, 0, 1)
        ZEND_ARG_INFO(0, string)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(grapheme_search_args, 0, 0, 2)
        ZEND_ARG_INFO(0, haystack)
        ZEND_ARG_INFO(0, needle)
        ZEND_ARG_INFO(0, offset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(grapheme_substr_args, 0, 0, 2)
        ZEND_ARG_INFO(0, string)
        ZEND_ARG_INFO(0, start)
        ZEND_ARG_INFO(0, length)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(grapheme_strstr_args, 0, 0, 2)
        ZEND_ARG_INFO(0, haystack)
        ZEND_ARG_INFO(0, needle)
        ZEND_ARG_INFO(0, before_needle)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(grapheme_extract_args, 0, 0, 2)
        ZEND_ARG_INFO(0, arg1)
        ZEND_ARG_INFO(0, arg2)
@@ -212,114 +191,96 @@ ZEND_BEGIN_ARG_INFO_EX(grapheme_extract_args, 0, 0, 2)
        ZEND_ARG_INFO(1, arg5)  /* 1 = pass by reference */
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_numfmt_create, 0, 0, 2)
        ZEND_ARG_INFO(0, locale)
        ZEND_ARG_INFO(0, style)
        ZEND_ARG_INFO(0, pattern)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_numfmt_get_error_code, 0, 0, 1)
        ZEND_ARG_INFO(0, nf)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_numfmt_format, 0, 0, 2)
        ZEND_ARG_INFO(0, nf)
        ZEND_ARG_INFO(0, num)
        ZEND_ARG_INFO(0, type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_numfmt_format_currency, 0, 0, 3)
        ZEND_ARG_INFO(0, nf)
        ZEND_ARG_INFO(0, num)
        ZEND_ARG_INFO(0, currency)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_numfmt_get_attribute, 0, 0, 2)
        ZEND_ARG_INFO(0, nf)
        ZEND_ARG_INFO(0, attr)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_numfmt_set_attribute, 0, 0, 3)
        ZEND_ARG_INFO(0, nf)
        ZEND_ARG_INFO(0, attr)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_numfmt_get_symbol, 0, 0, 2)
        ZEND_ARG_INFO(0, nf)
        ZEND_ARG_INFO(0, attr)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_numfmt_set_symbol, 0, 0, 3)
        ZEND_ARG_INFO(0, nf)
        ZEND_ARG_INFO(0, attr)
        ZEND_ARG_INFO(0, symbol)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_numfmt_set_pattern, 0, 0, 2)
        ZEND_ARG_INFO(0, nf)
        ZEND_ARG_INFO(0, pattern)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_numfmt_get_locale, 0, 0, 1)
        ZEND_ARG_INFO(0, nf)
        ZEND_ARG_INFO(0, type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msgfmt_create, 0, 0, 2)
        ZEND_ARG_INFO(0, locale)
        ZEND_ARG_INFO(0, pattern)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msgfmt_get_error_message, 0, 0, 1)
        ZEND_ARG_INFO(0, coll)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msgfmt_format, 0, 0, 2)
        ZEND_ARG_INFO(0, nf)
        ZEND_ARG_INFO(0, args)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msgfmt_format_message, 0, 0, 3)
        ZEND_ARG_INFO(0, locale)
        ZEND_ARG_INFO(0, pattern)
        ZEND_ARG_INFO(0, args)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msgfmt_parse, 0, 0, 2)
        ZEND_ARG_INFO(0, nf)
        ZEND_ARG_INFO(0, source)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_numfmt_parse_message, 0, 0, 3)
        ZEND_ARG_INFO(0, locale)
        ZEND_ARG_INFO(0, pattern)
        ZEND_ARG_INFO(0, source)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msgfmt_set_pattern, 0, 0, 2)
        ZEND_ARG_INFO(0, mf)
        ZEND_ARG_INFO(0, pattern)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msgfmt_get_locale, 0, 0, 1)
        ZEND_ARG_INFO(0, mf)
 ZEND_END_ARG_INFO()

diff --git a/ext/json/json.c b/ext/json/json.c
index 1d19d20deb9034f5be5abc889f23df5c77ac5551..6f5193019e1c9fbc371901b1e540a35417cc7ab9 100644 (file)
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -42,12 +42,10 @@ static const char digits[] = "0123456789abcdef";
 #define PHP_JSON_HEX_QUOT      (1<<3)
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_json_encode, 0, 0, 1)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_json_decode, 0, 0, 1)
        ZEND_ARG_INFO(0, json)
        ZEND_ARG_INFO(0, assoc)

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index 57d852bd71bc47d00053e03df4405dd613bf9233..a6b1ef2e0d3ddafbf9f584ad4af3b56bffa21625 100644 (file)
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -2212,18 +2212,15 @@ PHP_FUNCTION(ldap_8859_to_t61)
 #endif
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_connect, 0, 0, 0)
        ZEND_ARG_INFO(0, hostname)
        ZEND_ARG_INFO(0, port)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_resource, 0, 0, 1)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_bind, 0, 0, 1)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, bind_rdn)
@@ -2231,7 +2228,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_bind, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 #ifdef HAVE_LDAP_SASL
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_sasl_bind, 0, 0, 1)
        ZEND_ARG_INFO(0, link)
        ZEND_ARG_INFO(0, binddn)
@@ -2243,7 +2239,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_sasl_bind, 0, 0, 1)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_read, 0, 0, 3)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, base_dn)
@@ -2255,7 +2250,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_read, 0, 0, 3)
        ZEND_ARG_INFO(0, deref)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_list, 0, 0, 3)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, base_dn)
@@ -2267,7 +2261,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_list, 0, 0, 3)
        ZEND_ARG_INFO(0, deref)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_search, 0, 0, 3)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, base_dn)
@@ -2279,126 +2272,106 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_search, 0, 0, 3)
        ZEND_ARG_INFO(0, deref)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_count_entries, 0, 0, 2)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, result_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_first_entry, 0, 0, 2)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, result_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_next_entry, 0, 0, 2)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, result_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_get_entries, 0, 0, 2)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, result_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_first_attribute, 0, 0, 2)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, result_entry_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_next_attribute, 0, 0, 2)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, result_entry_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_get_attributes, 0, 0, 2)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, result_entry_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_get_values, 0, 0, 3)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, result_entry_identifier)
        ZEND_ARG_INFO(0, attribute)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_get_values_len, 0, 0, 3)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, result_entry_identifier)
        ZEND_ARG_INFO(0, attribute)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_get_dn, 0, 0, 2)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, result_entry_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_explode_dn, 0, 0, 2)
        ZEND_ARG_INFO(0, dn)
        ZEND_ARG_INFO(0, with_attrib)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_dn2ufn, 0, 0, 1)
        ZEND_ARG_INFO(0, dn)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_add, 0, 0, 3)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, dn)
        ZEND_ARG_INFO(0, entry)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_delete, 0, 0, 2)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, dn)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_modify, 0, 0, 3)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, dn)
        ZEND_ARG_INFO(0, entry)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_mod_add, 0, 0, 3)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, dn)
        ZEND_ARG_INFO(0, entry)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_mod_replace, 0, 0, 3)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, dn)
        ZEND_ARG_INFO(0, entry)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_mod_del, 0, 0, 3)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, dn)
        ZEND_ARG_INFO(0, entry)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_err2str, 0, 0, 1)
        ZEND_ARG_INFO(0, errno)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_compare, 0, 0, 4)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, dn)
@@ -2406,7 +2379,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_compare, 0, 0, 4)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_sort, 0, 0, 3)
        ZEND_ARG_INFO(0, link)
        ZEND_ARG_INFO(0, result)
@@ -2414,7 +2386,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_sort, 0, 0, 3)
 ZEND_END_ARG_INFO()
 
 #if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP_10
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_rename, 0, 0, 5)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, dn)
@@ -2423,34 +2394,29 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_rename, 0, 0, 5)
        ZEND_ARG_INFO(0, deleteoldrdn)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_get_option, 0, 0, 3)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, option)
        ZEND_ARG_INFO(1, retval)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_set_option, 0, 0, 3)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, option)
        ZEND_ARG_INFO(0, newval)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_first_reference, 0, 0, 2)
        ZEND_ARG_INFO(0, link)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_next_reference, 0, 0, 2)
        ZEND_ARG_INFO(0, link)
        ZEND_ARG_INFO(0, entry)
 ZEND_END_ARG_INFO()
 
 #ifdef HAVE_LDAP_PARSE_REFERENCE
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_parse_reference, 0, 0, 3)
        ZEND_ARG_INFO(0, link)
        ZEND_ARG_INFO(0, entry)
@@ -2460,7 +2426,6 @@ ZEND_END_ARG_INFO()
 
 
 #ifdef HAVE_LDAP_PARSE_RESULT
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_parse_result, 0, 0, 3)
        ZEND_ARG_INFO(0, link)
        ZEND_ARG_INFO(0, result)
@@ -2473,7 +2438,6 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if defined(LDAP_API_FEATURE_X_OPENLDAP) && defined(HAVE_3ARG_SETREBINDPROC)
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_set_rebind_proc, 0, 0, 2)
        ZEND_ARG_INFO(0, link)
        ZEND_ARG_INFO(0, callback)
@@ -2481,12 +2445,10 @@ ZEND_END_ARG_INFO()
 #endif
 
 #ifdef STR_TRANSLATION
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_t61_to_8859, 0, 0, 1)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_8859_to_t61, 0, 0, 1)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()

diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c
index 60f41e2020fe2f152444eea274a3f5452e65168c..0ca861370c51f4cb7785f8c8b7833545fd409b5c 100644 (file)
--- a/ext/libxml/libxml.c
+++ b/ext/libxml/libxml.c
@@ -87,25 +87,20 @@ static PHP_MINFO_FUNCTION(libxml);
 /* }}} */
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_libxml_set_streams_context, 0)
        ZEND_ARG_INFO(0, context)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_libxml_use_internal_errors, 0)
        ZEND_ARG_INFO(0, use_errors)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_libxml_get_last_error, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_libxml_get_errors, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_libxml_clear_errors, 0)
 ZEND_END_ARG_INFO()
 

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index dcf6fbccab68fc9ce0a6df5cd72e6141899aeea8..623b3678f7c8e4d9a3607a41317f13b8a8fd4819 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -200,60 +200,49 @@ static const struct mb_overload_def mb_ovld[] = {
 /* }}} */
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_language, 0, 0, 0)
        ZEND_ARG_INFO(0, language)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_internal_encoding, 0, 0, 0)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_http_input, 0, 0, 0)
        ZEND_ARG_INFO(0, type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_http_output, 0, 0, 0)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_detect_order, 0, 0, 0)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_substitute_character, 0, 0, 0)
        ZEND_ARG_INFO(0, substchar)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_preferred_mime_name, 0, 0, 1)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_parse_str, 0, 0, 1)
        ZEND_ARG_INFO(0, encoded_string)
        ZEND_ARG_INFO(1, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_output_handler, 0, 0, 2)
        ZEND_ARG_INFO(0, contents)
        ZEND_ARG_INFO(0, status)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strlen, 0, 0, 1)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strpos, 0, 0, 2)
        ZEND_ARG_INFO(0, haystack)
        ZEND_ARG_INFO(0, needle)
@@ -261,7 +250,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strpos, 0, 0, 2)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strrpos, 0, 0, 2)
        ZEND_ARG_INFO(0, haystack)
        ZEND_ARG_INFO(0, needle)
@@ -269,7 +257,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strrpos, 0, 0, 2)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_stripos, 0, 0, 2)
        ZEND_ARG_INFO(0, haystack)
        ZEND_ARG_INFO(0, needle)
@@ -277,7 +264,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_stripos, 0, 0, 2)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strripos, 0, 0, 2)
        ZEND_ARG_INFO(0, haystack)
        ZEND_ARG_INFO(0, needle)
@@ -285,7 +271,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strripos, 0, 0, 2)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strstr, 0, 0, 2)
        ZEND_ARG_INFO(0, haystack)
        ZEND_ARG_INFO(0, needle)
@@ -293,7 +278,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strstr, 0, 0, 2)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strrchr, 0, 0, 2)
        ZEND_ARG_INFO(0, haystack)
        ZEND_ARG_INFO(0, needle)
@@ -301,7 +285,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strrchr, 0, 0, 2)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_stristr, 0, 0, 2)
        ZEND_ARG_INFO(0, haystack)
        ZEND_ARG_INFO(0, needle)
@@ -309,7 +292,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_stristr, 0, 0, 2)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strrichr, 0, 0, 2)
        ZEND_ARG_INFO(0, haystack)
        ZEND_ARG_INFO(0, needle)
@@ -317,14 +299,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strrichr, 0, 0, 2)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_substr_count, 0, 0, 2)
        ZEND_ARG_INFO(0, haystack)
        ZEND_ARG_INFO(0, needle)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_substr, 0, 0, 2)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, start)
@@ -332,7 +312,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_substr, 0, 0, 2)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strcut, 0, 0, 2)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, start)
@@ -340,13 +319,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strcut, 0, 0, 2)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strwidth, 0, 0, 1)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strimwidth, 0, 0, 3)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, start)
@@ -355,49 +332,41 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strimwidth, 0, 0, 3)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_convert_encoding, 0, 0, 2)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, to)
        ZEND_ARG_INFO(0, from)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_convert_case, 0, 0, 2)
        ZEND_ARG_INFO(0, sourcestring)
        ZEND_ARG_INFO(0, mode)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strtoupper, 0, 0, 1)
        ZEND_ARG_INFO(0, sourcestring)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strtolower, 0, 0, 1)
        ZEND_ARG_INFO(0, sourcestring)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_detect_encoding, 0, 0, 1)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, encoding_list)
        ZEND_ARG_INFO(0, strict)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_list_encodings, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_encoding_aliases, 0, 0, 1)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_encode_mimeheader, 0, 0, 1)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, charset)
@@ -406,40 +375,34 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_encode_mimeheader, 0, 0, 1)
        ZEND_ARG_INFO(0, indent)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_decode_mimeheader, 0, 0, 1)
        ZEND_ARG_INFO(0, string)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_convert_kana, 0, 0, 1)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, option)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_convert_variables, 1, 0, 3)
        ZEND_ARG_INFO(0, to)
        ZEND_ARG_INFO(0, from)
        ZEND_ARG_INFO(1, ...)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_encode_numericentity, 0, 0, 2)
        ZEND_ARG_INFO(0, string)
        ZEND_ARG_INFO(0, convmap)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_decode_numericentity, 0, 0, 2)
        ZEND_ARG_INFO(0, string)
        ZEND_ARG_INFO(0, convmap)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_send_mail, 0, 0, 3)
        ZEND_ARG_INFO(0, to)
        ZEND_ARG_INFO(0, subject)
@@ -448,37 +411,31 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_send_mail, 0, 0, 3)
        ZEND_ARG_INFO(0, additional_parameters)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_get_info, 0, 0, 0)
        ZEND_ARG_INFO(0, type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_check_encoding, 0, 0, 0)
        ZEND_ARG_INFO(0, var)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_regex_encoding, 0, 0, 0)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_ereg, 0, 0, 2)
        ZEND_ARG_INFO(0, pattern)
        ZEND_ARG_INFO(0, string)
        ZEND_ARG_INFO(1, registers)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_eregi, 0, 0, 2)
        ZEND_ARG_INFO(0, pattern)
        ZEND_ARG_INFO(0, string)
        ZEND_ARG_INFO(1, registers)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_ereg_replace, 0, 0, 3)
        ZEND_ARG_INFO(0, pattern)
        ZEND_ARG_INFO(0, replacement)
@@ -486,66 +443,55 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_ereg_replace, 0, 0, 3)
        ZEND_ARG_INFO(0, option)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_eregi_replace, 0, 0, 3)
        ZEND_ARG_INFO(0, pattern)
        ZEND_ARG_INFO(0, replacement)
        ZEND_ARG_INFO(0, string)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_split, 0, 0, 2)
        ZEND_ARG_INFO(0, pattern)
        ZEND_ARG_INFO(0, string)
        ZEND_ARG_INFO(0, limit)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_ereg_match, 0, 0, 2)
        ZEND_ARG_INFO(0, pattern)
        ZEND_ARG_INFO(0, string)
        ZEND_ARG_INFO(0, option)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_ereg_search, 0, 0, 0)
        ZEND_ARG_INFO(0, pattern)
        ZEND_ARG_INFO(0, option)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_ereg_search_pos, 0, 0, 0)
        ZEND_ARG_INFO(0, pattern)
        ZEND_ARG_INFO(0, option)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_ereg_search_regs, 0, 0, 0)
        ZEND_ARG_INFO(0, pattern)
        ZEND_ARG_INFO(0, option)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_ereg_search_init, 0, 0, 1)
        ZEND_ARG_INFO(0, string)
        ZEND_ARG_INFO(0, pattern)
        ZEND_ARG_INFO(0, option)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_mb_ereg_search_getregs, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_mb_ereg_search_getpos, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_ereg_search_setpos, 0, 0, 1)
        ZEND_ARG_INFO(0, position)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_regex_set_options, 0, 0, 0)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()

diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c
index 4575c93cfbd3ff587b21622a679e6f0aec38c9df..f2d91bc1f617d44fea3bac5e4d2f4c1924f933aa 100644 (file)
--- a/ext/mcrypt/mcrypt.c
+++ b/ext/mcrypt/mcrypt.c
@@ -50,7 +50,6 @@ typedef struct _php_mcrypt {
 } php_mcrypt;
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_module_open, 0, 0, 4)
        ZEND_ARG_INFO(0, cipher)
        ZEND_ARG_INFO(0, cipher_directory)
@@ -58,161 +57,132 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_module_open, 0, 0, 4)
        ZEND_ARG_INFO(0, mode_directory)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_generic_init, 0, 0, 3)
        ZEND_ARG_INFO(0, td)
        ZEND_ARG_INFO(0, key)
        ZEND_ARG_INFO(0, iv)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_generic, 0, 0, 2)
        ZEND_ARG_INFO(0, td)
        ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mdecrypt_generic, 0, 0, 2)
        ZEND_ARG_INFO(0, td)
        ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_enc_get_supported_key_sizes, 0, 0, 1)
        ZEND_ARG_INFO(0, td)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_enc_self_test, 0, 0, 1)
        ZEND_ARG_INFO(0, td)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_module_close, 0, 0, 1)
        ZEND_ARG_INFO(0, td)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_generic_deinit, 0, 0, 1)
        ZEND_ARG_INFO(0, td)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_enc_is_block_algorithm_mode, 0, 0, 1)
        ZEND_ARG_INFO(0, td)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_enc_is_block_algorithm, 0, 0, 1)
        ZEND_ARG_INFO(0, td)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_enc_is_block_mode, 0, 0, 1)
        ZEND_ARG_INFO(0, td)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_enc_get_block_size, 0, 0, 1)
        ZEND_ARG_INFO(0, td)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_enc_get_key_size, 0, 0, 1)
        ZEND_ARG_INFO(0, td)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_enc_get_iv_size, 0, 0, 1)
        ZEND_ARG_INFO(0, td)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_enc_get_algorithms_name, 0, 0, 1)
        ZEND_ARG_INFO(0, td)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_enc_get_modes_name, 0, 0, 1)
        ZEND_ARG_INFO(0, td)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_module_self_test, 0, 0, 1)
        ZEND_ARG_INFO(0, algorithm)
        ZEND_ARG_INFO(0, lib_dir)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_module_is_block_algorithm_mode, 0, 0, 1)
        ZEND_ARG_INFO(0, mode)
        ZEND_ARG_INFO(0, lib_dir)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_module_is_block_algorithm, 0, 0, 1)
        ZEND_ARG_INFO(0, algorithm)
        ZEND_ARG_INFO(0, lib_dir)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_module_is_block_mode, 0, 0, 1)
        ZEND_ARG_INFO(0, mode)
        ZEND_ARG_INFO(0, lib_dir)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_module_get_algo_block_size, 0, 0, 1)
        ZEND_ARG_INFO(0, algorithm)
        ZEND_ARG_INFO(0, lib_dir)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_module_get_algo_key_size, 0, 0, 1)
        ZEND_ARG_INFO(0, algorithm)
        ZEND_ARG_INFO(0, lib_dir)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_module_get_supported_key_sizes, 0, 0, 1)
        ZEND_ARG_INFO(0, algorithm)
        ZEND_ARG_INFO(0, lib_dir)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_list_algorithms, 0, 0, 0)
        ZEND_ARG_INFO(0, lib_dir)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_list_modes, 0, 0, 0)
        ZEND_ARG_INFO(0, lib_dir)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_get_key_size, 0, 0, 2)
        ZEND_ARG_INFO(0, cipher)
        ZEND_ARG_INFO(0, module)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_get_block_size, 0, 0, 2)
        ZEND_ARG_INFO(0, cipher)
        ZEND_ARG_INFO(0, module)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_get_iv_size, 0, 0, 2)
        ZEND_ARG_INFO(0, cipher)
        ZEND_ARG_INFO(0, module)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_get_cipher_name, 0, 0, 1)
        ZEND_ARG_INFO(0, cipher)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_encrypt, 0, 0, 5)
        ZEND_ARG_INFO(0, cipher)
        ZEND_ARG_INFO(0, key)
@@ -221,7 +191,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_encrypt, 0, 0, 5)
        ZEND_ARG_INFO(0, iv)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_decrypt, 0, 0, 5)
        ZEND_ARG_INFO(0, cipher)
        ZEND_ARG_INFO(0, key)
@@ -230,7 +199,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_decrypt, 0, 0, 5)
        ZEND_ARG_INFO(0, iv)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_ecb, 0, 0, 5)
        ZEND_ARG_INFO(0, cipher)
        ZEND_ARG_INFO(0, key)
@@ -239,7 +207,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_ecb, 0, 0, 5)
        ZEND_ARG_INFO(0, iv)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_cbc, 0, 0, 5)
        ZEND_ARG_INFO(0, cipher)
        ZEND_ARG_INFO(0, key)
@@ -248,7 +215,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_cbc, 0, 0, 5)
        ZEND_ARG_INFO(0, iv)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_cfb, 0, 0, 5)
        ZEND_ARG_INFO(0, cipher)
        ZEND_ARG_INFO(0, key)
@@ -257,7 +223,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_cfb, 0, 0, 5)
        ZEND_ARG_INFO(0, iv)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_ofb, 0, 0, 5)
        ZEND_ARG_INFO(0, cipher)
        ZEND_ARG_INFO(0, key)
@@ -266,7 +231,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_ofb, 0, 0, 5)
        ZEND_ARG_INFO(0, iv)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mcrypt_create_iv, 0, 0, 2)
        ZEND_ARG_INFO(0, size)
        ZEND_ARG_INFO(0, source)

diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c
index 8d56c92d31d25890df51e0f82223fd30c3cc1f26..f792f7f7fb12268ce0ac13f00626b3c682c1f83f 100644 (file)
--- a/ext/msql/php_msql.c
+++ b/ext/msql/php_msql.c
@@ -46,166 +46,138 @@ static php_msql_globals msql_globals;
 #define MSQL_BOTH              (MSQL_ASSOC|MSQL_NUM)
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_connect, 0, 0, 0)
        ZEND_ARG_INFO(0, hostname)
        ZEND_ARG_INFO(0, username)
        ZEND_ARG_INFO(0, password)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_pconnect, 0, 0, 0)
        ZEND_ARG_INFO(0, hostname)
        ZEND_ARG_INFO(0, username)
        ZEND_ARG_INFO(0, password)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_close, 0, 0, 0)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_select_db, 0, 0, 1)
        ZEND_ARG_INFO(0, database_name)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_create_db, 0, 0, 1)
        ZEND_ARG_INFO(0, database_name)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_drop_db, 0, 0, 1)
        ZEND_ARG_INFO(0, database_name)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_query, 0, 0, 1)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_db_query, 0, 0, 2)
        ZEND_ARG_INFO(0, database_name)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_list_dbs, 0, 0, 0)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_list_tables, 0, 0, 1)
        ZEND_ARG_INFO(0, database_name)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_list_fields, 0, 0, 2)
        ZEND_ARG_INFO(0, database_name)
        ZEND_ARG_INFO(0, table_name)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_msql_error, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_result, 0, 0, 2)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_INFO(0, row)
        ZEND_ARG_INFO(0, field)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_num_rows, 0, 0, 1)
        ZEND_ARG_INFO(0, query)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_num_fields, 0, 0, 1)
        ZEND_ARG_INFO(0, query)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_fetch_row, 0, 0, 1)
        ZEND_ARG_INFO(0, query)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_fetch_object, 0, 0, 1)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_INFO(0, result_type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_fetch_array, 0, 0, 1)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_INFO(0, result_type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_data_seek, 0, 0, 2)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_INFO(0, row_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_fetch_field, 0, 0, 1)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_INFO(0, field_offset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_field_seek, 0, 0, 2)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_INFO(0, field_offset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_field_name, 0, 0, 2)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_INFO(0, field_index)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_field_table, 0, 0, 2)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_INFO(0, field_offset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_field_len, 0, 0, 2)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_INFO(0, field_offet)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_field_type, 0, 0, 2)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_INFO(0, field_offset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_field_flags, 0, 0, 2)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_INFO(0, field_offset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_free_result, 0, 0, 1)
        ZEND_ARG_INFO(0, query)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msql_affected_rows, 0, 0, 1)
        ZEND_ARG_INFO(0, query)
 ZEND_END_ARG_INFO()

diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index 10ef01932cc2aa9df18ae3dcc01d9bd224a14723..08f6e4242e3cfb0233960d37df3396b4ba85f92f 100644 (file)
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -48,7 +48,6 @@ static void php_mssql_get_column_content_without_type(mssql_link *mssql_ptr,int
 static void _mssql_bind_hash_dtor(void *data);
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_connect, 0, 0, 0)
        ZEND_ARG_INFO(0, servername)
        ZEND_ARG_INFO(0, username)
@@ -56,86 +55,71 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_connect, 0, 0, 0)
        ZEND_ARG_INFO(0, newlink)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_close, 0, 0, 0)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_select_db, 0, 0, 1)
        ZEND_ARG_INFO(0, database_name)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_query, 0, 0, 1)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_INFO(0, link_identifier)
        ZEND_ARG_INFO(0, batch_size)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_fetch_batch, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_rows_affected, 0, 0, 1)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_mssql_get_last_message, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_fetch_field, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, field_offset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_fetch_array, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, result_type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_fetch_assoc, 0, 0, 1)
        ZEND_ARG_INFO(0, result_id)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_field_length, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, offset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_data_seek, 0, 0, 2)
        ZEND_ARG_INFO(0, result_identifier)
        ZEND_ARG_INFO(0, row_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_result, 0, 0, 3)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, row)
        ZEND_ARG_INFO(0, field)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_min_error_severity, 0, 0, 1)
        ZEND_ARG_INFO(0, severity)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_init, 0, 0, 1)
        ZEND_ARG_INFO(0, sp_name)
        ZEND_ARG_INFO(0, link_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_bind, 0, 0, 4)
        ZEND_ARG_INFO(0, stmt)
        ZEND_ARG_INFO(0, param_name)
@@ -146,18 +130,15 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_bind, 0, 0, 4)
        ZEND_ARG_INFO(0, maxlen)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_execute, 0, 0, 1)
        ZEND_ARG_INFO(0, stmt)
        ZEND_ARG_INFO(0, skip_results)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_free_statement, 0, 0, 1)
        ZEND_ARG_INFO(0, stmt)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mssql_guid_string, 0, 0, 1)
        ZEND_ARG_INFO(0, binary)
        ZEND_ARG_INFO(0, short_format)

diff --git a/ext/mysqli/mysqli_fe.c b/ext/mysqli/mysqli_fe.c
index 14df05862fd49b48074eb72e641df64005f82dad..56c9f0a8d8424098c2186026b118efc28e3e49dc 100644 (file)
--- a/ext/mysqli/mysqli_fe.c
+++ b/ext/mysqli/mysqli_fe.c
@@ -32,20 +32,17 @@
 #include "php_mysqli_structs.h"
 
 
-static
-       ZEND_BEGIN_ARG_INFO(second_arg_force_by_ref_rest, 1)
-               ZEND_ARG_PASS_INFO(0)
-       ZEND_END_ARG_INFO();
+ZEND_BEGIN_ARG_INFO(second_arg_force_by_ref_rest, 1)
+       ZEND_ARG_PASS_INFO(0)
+ZEND_END_ARG_INFO();
 
-static
-       ZEND_BEGIN_ARG_INFO(third_arg_force_by_ref_rest, 1)
-               ZEND_ARG_PASS_INFO(0)
-               ZEND_ARG_PASS_INFO(0)
-       ZEND_END_ARG_INFO();
+ZEND_BEGIN_ARG_INFO(third_arg_force_by_ref_rest, 1)
+       ZEND_ARG_PASS_INFO(0)
+       ZEND_ARG_PASS_INFO(0)
+ZEND_END_ARG_INFO();
 
-static
-       ZEND_BEGIN_ARG_INFO(all_args_force_by_ref, 1)
-       ZEND_END_ARG_INFO();
+ZEND_BEGIN_ARG_INFO(all_args_force_by_ref, 1)
+ZEND_END_ARG_INFO();
 
 
 /* {{{ mysqli_functions[]

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index b4bb12739391d69b2c4adcd4774a92f0653cbfda..e43b7758e3793208c480eb43a1fb6588839c0a83 100644 (file)
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -105,7 +105,6 @@ ZEND_GET_MODULE(oci8)
 /* }}} */
 
 /* {{{ Function arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_define_by_name, 0, 0, 3)
        ZEND_ARG_INFO(0, statement_resource)
        ZEND_ARG_INFO(0, column_name)
@@ -113,7 +112,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_define_by_name, 0, 0, 3)
        ZEND_ARG_INFO(0, type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_bind_by_name, 0, 0, 3)
        ZEND_ARG_INFO(0, statement_resource)
        ZEND_ARG_INFO(0, column_name)
@@ -122,7 +120,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_bind_by_name, 0, 0, 3)
        ZEND_ARG_INFO(0, type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_bind_array_by_name, 0, 0, 4)
        ZEND_ARG_INFO(0, statement_resource)
        ZEND_ARG_INFO(0, column_name)
@@ -132,119 +129,99 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_bind_array_by_name, 0, 0, 4)
        ZEND_ARG_INFO(0, type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_free_descriptor, 0, 0, 1)
        ZEND_ARG_INFO(0, lob_descriptor)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_save, 0, 0, 2)
        ZEND_ARG_INFO(0, lob_descriptor)
        ZEND_ARG_INFO(0, data)
        ZEND_ARG_INFO(0, offset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_import, 0, 0, 2)
        ZEND_ARG_INFO(0, lob_descriptor)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_load, 0, 0, 1)
        ZEND_ARG_INFO(0, lob_descriptor)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_read, 0, 0, 2)
        ZEND_ARG_INFO(0, lob_descriptor)
        ZEND_ARG_INFO(0, length)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_eof, 0, 0, 1)
        ZEND_ARG_INFO(0, lob_descriptor)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_tell, 0, 0, 1)
        ZEND_ARG_INFO(0, lob_descriptor)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_rewind, 0, 0, 1)
        ZEND_ARG_INFO(0, lob_descriptor)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_seek, 0, 0, 2)
        ZEND_ARG_INFO(0, lob_descriptor)
        ZEND_ARG_INFO(0, offset)
        ZEND_ARG_INFO(0, whence)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_size, 0, 0, 1)
        ZEND_ARG_INFO(0, lob_descriptor)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_write, 0, 0, 2)
        ZEND_ARG_INFO(0, lob_descriptor)
        ZEND_ARG_INFO(0, string)
        ZEND_ARG_INFO(0, length)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_append, 0, 0, 2)
        ZEND_ARG_INFO(0, lob_descriptor_to)
        ZEND_ARG_INFO(0, lob_descriptor_from)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_truncate, 0, 0, 1)
        ZEND_ARG_INFO(0, lob_descriptor)
        ZEND_ARG_INFO(0, length)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_erase, 0, 0, 1)
        ZEND_ARG_INFO(0, lob_descriptor)
        ZEND_ARG_INFO(0, offset)
        ZEND_ARG_INFO(0, length)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_flush, 0, 0, 1)
        ZEND_ARG_INFO(0, lob_descriptor)
        ZEND_ARG_INFO(0, flag)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ocisetbufferinglob, 0, 0, 2)
        ZEND_ARG_INFO(0, lob_descriptor)
        ZEND_ARG_INFO(0, mode)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ocigetbufferinglob, 0, 0, 1)
        ZEND_ARG_INFO(0, lob_descriptor)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_copy, 0, 0, 2)
        ZEND_ARG_INFO(0, lob_descriptor_to)
        ZEND_ARG_INFO(0, lob_descriptor_from)
        ZEND_ARG_INFO(0, length)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_is_equal, 0, 0, 2)
        ZEND_ARG_INFO(0, lob_descriptor)
        ZEND_ARG_INFO(0, lob_descriptor)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_export, 0, 0, 2)
        ZEND_ARG_INFO(0, lob_descriptor)
        ZEND_ARG_INFO(0, filename)
@@ -252,93 +229,77 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_export, 0, 0, 2)
        ZEND_ARG_INFO(0, length)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_new_descriptor, 0, 0, 1)
        ZEND_ARG_INFO(0, connection_resource)
        ZEND_ARG_INFO(0, type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_rollback, 0, 0, 1)
        ZEND_ARG_INFO(0, connection_resource)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_commit, 0, 0, 1)
        ZEND_ARG_INFO(0, connection_resource)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_field_name, 0, 0, 2)
        ZEND_ARG_INFO(0, statement_resource)
        ZEND_ARG_INFO(0, column_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_field_size, 0, 0, 2)
        ZEND_ARG_INFO(0, statement_resource)
        ZEND_ARG_INFO(0, column_number_or_name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_field_scale, 0, 0, 2)
        ZEND_ARG_INFO(0, statement_resource)
        ZEND_ARG_INFO(0, column_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_field_precision, 0, 0, 2)
        ZEND_ARG_INFO(0, statement_resource)
        ZEND_ARG_INFO(0, column_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_field_type, 0, 0, 2)
        ZEND_ARG_INFO(0, statement_resource)
        ZEND_ARG_INFO(0, column_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_field_type_raw, 0, 0, 2)
        ZEND_ARG_INFO(0, statement_resource)
        ZEND_ARG_INFO(0, column_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_field_is_null, 0, 0, 2)
        ZEND_ARG_INFO(0, statement_resource)
        ZEND_ARG_INFO(0, column_number_or_name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_internal_debug, 0, 0, 1)
        ZEND_ARG_INFO(0, mode)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_execute, 0, 0, 1)
        ZEND_ARG_INFO(0, statement_resource)
        ZEND_ARG_INFO(0, mode)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_cancel, 0, 0, 1)
        ZEND_ARG_INFO(0, statement_resource)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_fetch, 0, 0, 1)
        ZEND_ARG_INFO(0, statement_resource)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ocifetchinto, 0, 0, 2)
        ZEND_ARG_INFO(0, statement_resource)
        ZEND_ARG_INFO(1, result)
        ZEND_ARG_INFO(0, mode)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_fetch_all, 0, 0, 2)
        ZEND_ARG_INFO(0, statement_resource)
        ZEND_ARG_INFO(1, output)
@@ -347,38 +308,31 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_fetch_all, 0, 0, 2)
        ZEND_ARG_INFO(0, flags)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_fetch_object, 0, 0, 1)
        ZEND_ARG_INFO(0, statement_resource)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_fetch_row, 0, 0, 1)
        ZEND_ARG_INFO(0, statement_resource)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_fetch_assoc, 0, 0, 1)
        ZEND_ARG_INFO(0, statement_resource)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_fetch_array, 0, 0, 1)
        ZEND_ARG_INFO(0, statement_resource)
        ZEND_ARG_INFO(0, mode)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_free_statement, 0, 0, 1)
        ZEND_ARG_INFO(0, statement_resource)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_close, 0, 0, 1)
        ZEND_ARG_INFO(0, connection_resource)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_new_connect, 0, 0, 2)
        ZEND_ARG_INFO(0, username)
        ZEND_ARG_INFO(0, password)
@@ -387,7 +341,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_new_connect, 0, 0, 2)
        ZEND_ARG_INFO(0, session_mode)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_connect, 0, 0, 2)
        ZEND_ARG_INFO(0, username)
        ZEND_ARG_INFO(0, password)
@@ -396,7 +349,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_connect, 0, 0, 2)
        ZEND_ARG_INFO(0, session_mode)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_pconnect, 0, 0, 2)
        ZEND_ARG_INFO(0, username)
        ZEND_ARG_INFO(0, password)
@@ -405,29 +357,24 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_pconnect, 0, 0, 2)
        ZEND_ARG_INFO(0, session_mode)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_error, 0, 0, 0)
        ZEND_ARG_INFO(0, connection_or_statement_resource)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_num_fields, 0, 0, 1)
        ZEND_ARG_INFO(0, statement_resource)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_parse, 0, 0, 2)
        ZEND_ARG_INFO(0, connection_resource)
        ZEND_ARG_INFO(0, sql_text)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_set_prefetch, 0, 0, 2)
        ZEND_ARG_INFO(0, statement_resource)
        ZEND_ARG_INFO(0, number_of_rows)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_password_change, 0, 0, 4)
        ZEND_ARG_INFO(0, connection_resource_or_connection_string)
        ZEND_ARG_INFO(0, username)
@@ -435,79 +382,65 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_password_change, 0, 0, 4)
        ZEND_ARG_INFO(0, new_password)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_new_cursor, 0, 0, 1)
        ZEND_ARG_INFO(0, connection_resource)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_result, 0, 0, 2)
        ZEND_ARG_INFO(0, statement_resource)
        ZEND_ARG_INFO(0, column_number_or_name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_server_version, 0, 0, 1)
        ZEND_ARG_INFO(0, connection_resource)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_statement_type, 0, 0, 1)
        ZEND_ARG_INFO(0, statement_resource)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_num_rows, 0, 0, 1)
        ZEND_ARG_INFO(0, statement_resource)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_free_collection, 0, 0, 1)
        ZEND_ARG_INFO(0, collection)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_append, 0, 0, 2)
        ZEND_ARG_INFO(0, collection)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_element_get, 0, 0, 2)
        ZEND_ARG_INFO(0, collection)
        ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_assign, 0, 0, 2)
        ZEND_ARG_INFO(0, collection_to)
        ZEND_ARG_INFO(0, collection_from)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_element_assign, 0, 0, 3)
        ZEND_ARG_INFO(0, collection)
        ZEND_ARG_INFO(0, index)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_size, 0, 0, 1)
        ZEND_ARG_INFO(0, collection)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_max, 0, 0, 1)
        ZEND_ARG_INFO(0, collection)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_trim, 0, 0, 2)
        ZEND_ARG_INFO(0, collection)
        ZEND_ARG_INFO(0, number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_new_collection, 0, 0, 2)
        ZEND_ARG_INFO(0, connection_resource)
        ZEND_ARG_INFO(0, type_name)
@@ -516,141 +449,113 @@ ZEND_END_ARG_INFO()
 /* }}} */
 
 /* {{{ LOB Method arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_save_method, 0, 0, 1)
        ZEND_ARG_INFO(0, data)
        ZEND_ARG_INFO(0, offset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_import_method, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_oci_lob_load_method, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_read_method, 0, 0, 1)
        ZEND_ARG_INFO(0, length)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_oci_lob_eof_method, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_oci_lob_tell_method, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_oci_lob_rewind_method, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_seek_method, 0, 0, 1)
        ZEND_ARG_INFO(0, offset)
        ZEND_ARG_INFO(0, whence)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_oci_lob_size_method, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_write_method, 0, 0, 1)
        ZEND_ARG_INFO(0, string)
        ZEND_ARG_INFO(0, length)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_append_method, 0, 0, 1)
        ZEND_ARG_INFO(0, lob_descriptor_from)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_truncate_method, 0, 0, 0)
        ZEND_ARG_INFO(0, length)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_erase_method, 0, 0, 0)
        ZEND_ARG_INFO(0, offset)
        ZEND_ARG_INFO(0, length)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_flush_method, 0, 0, 0)
        ZEND_ARG_INFO(0, flag)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_setbuffering_method, 0, 0, 1)
        ZEND_ARG_INFO(0, mode)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_oci_lob_getbuffering_method, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_export_method, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, start)
        ZEND_ARG_INFO(0, length)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_lob_write_temporary_method, 0, 0, 1)
        ZEND_ARG_INFO(0, data)
        ZEND_ARG_INFO(0, type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_oci_lob_close_method, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_oci_free_descriptor_method, 0)
 ZEND_END_ARG_INFO()
 /* }}} */
 
 /* {{{ Collection Method arginfo */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_oci_collection_free_method, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_append_method, 0, 0, 1)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_element_get_method, 0, 0, 1)
        ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_assign_method, 0, 0, 1)
        ZEND_ARG_INFO(0, collection_from)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_element_assign_method, 0, 0, 2)
        ZEND_ARG_INFO(0, index)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_oci_collection_size_method, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_oci_collection_max_method, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_trim_method, 0, 0, 1)
        ZEND_ARG_INFO(0, number)
 ZEND_END_ARG_INFO()

diff --git a/ext/odbc/birdstep.c b/ext/odbc/birdstep.c
index 0f1f3b58a518d9c647978a8af4d4c7a10a7fde94..d9805792d10a72ab51a8a9dbf7c07c9e2536f733 100644 (file)
--- a/ext/odbc/birdstep.c
+++ b/ext/odbc/birdstep.c
@@ -50,67 +50,55 @@
 #include "php_ini.h"
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_connect, 0, 0, 3)
        ZEND_ARG_INFO(0, server)
        ZEND_ARG_INFO(0, user)
        ZEND_ARG_INFO(0, pass)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_close, 0, 0, 1)
        ZEND_ARG_INFO(0, id)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_exec, 0, 0, 2)
        ZEND_ARG_INFO(0, index)
        ZEND_ARG_INFO(0, exec_str)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_fetch, 0, 0, 1)
        ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_result, 0, 0, 2)
        ZEND_ARG_INFO(0, index)
        ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_freeresult, 0, 0, 1)
        ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_autocommit, 0, 0, 1)
        ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_off_autocommit, 0, 0, 1)
        ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_commit, 0, 0, 1)
        ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_rollback, 0, 0, 1)
        ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_fieldname, 0, 0, 2)
        ZEND_ARG_INFO(0, index)
        ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_birdstep_fieldnum, 0, 0, 1)
        ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 6f5ee6d49175ef8bc0bce6509557f62086c952d8..f1fdc82b8a54e387a37184845331ecf3a55ec896 100644 (file)
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -67,48 +67,40 @@ static int le_result, le_conn, le_pconn;
 #define SAFE_SQL_NTS(n) ((SQLSMALLINT) ((n)?(SQL_NTS):0))
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_odbc_close_all, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_binmode, 0, 0, 2)
        ZEND_ARG_INFO(0, result_id)
        ZEND_ARG_INFO(0, mode)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_longreadlen, 0, 0, 2)
        ZEND_ARG_INFO(0, result_id)
        ZEND_ARG_INFO(0, length)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_prepare, 0, 0, 2)
        ZEND_ARG_INFO(0, connection_id)
        ZEND_ARG_INFO(0, query)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_execute, 0, 0, 1)
        ZEND_ARG_INFO(0, result_id)
        ZEND_ARG_INFO(0, parameters_array)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_cursor, 0, 0, 1)
        ZEND_ARG_INFO(0, result_id)
 ZEND_END_ARG_INFO()
 
 #ifdef HAVE_SQLDATASOURCES
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_data_source, 0, 0, 2)
        ZEND_ARG_INFO(0, connection_id)
        ZEND_ARG_INFO(0, fetch_type)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_exec, 0, 0, 2)
        ZEND_ARG_INFO(0, connection_id)
        ZEND_ARG_INFO(0, query)
@@ -116,50 +108,42 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_exec, 0, 0, 2)
 ZEND_END_ARG_INFO()
 
 #ifdef PHP_ODBC_HAVE_FETCH_HASH
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_fetch_object, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, rownumber)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_fetch_array, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, rownumber)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_fetch_into, 0, 0, 2)
        ZEND_ARG_INFO(0, result_id)
        ZEND_ARG_INFO(0, result_array)
        ZEND_ARG_INFO(0, rownumber)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_fetch_row, 0, 0, 1)
        ZEND_ARG_INFO(0, result_id)
        ZEND_ARG_INFO(0, row_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_result, 0, 0, 2)
        ZEND_ARG_INFO(0, result_id)
        ZEND_ARG_INFO(0, field)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_result_all, 0, 0, 1)
        ZEND_ARG_INFO(0, result_id)
        ZEND_ARG_INFO(0, format)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_free_result, 0, 0, 1)
        ZEND_ARG_INFO(0, result_id)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_connect, 0, 0, 3)
        ZEND_ARG_INFO(0, dsn)
        ZEND_ARG_INFO(0, user)
@@ -167,7 +151,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_connect, 0, 0, 3)
        ZEND_ARG_INFO(0, cursor_option)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_pconnect, 0, 0, 3)
        ZEND_ARG_INFO(0, dsn)
        ZEND_ARG_INFO(0, user)
@@ -175,85 +158,70 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_pconnect, 0, 0, 3)
        ZEND_ARG_INFO(0, cursor_option)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_close, 0, 0, 1)
        ZEND_ARG_INFO(0, connection_id)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_num_rows, 0, 0, 1)
        ZEND_ARG_INFO(0, result_id)
 ZEND_END_ARG_INFO()
 
 #if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30)
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_next_result, 0, 0, 1)
        ZEND_ARG_INFO(0, result_id)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_num_fields, 0, 0, 1)
        ZEND_ARG_INFO(0, result_id)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_field_name, 0, 0, 2)
        ZEND_ARG_INFO(0, result_id)
        ZEND_ARG_INFO(0, field_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_field_type, 0, 0, 2)
        ZEND_ARG_INFO(0, result_id)
        ZEND_ARG_INFO(0, field_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_field_len, 0, 0, 2)
        ZEND_ARG_INFO(0, result_id)
        ZEND_ARG_INFO(0, field_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_field_scale, 0, 0, 2)
        ZEND_ARG_INFO(0, result_id)
        ZEND_ARG_INFO(0, field_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_field_num, 0, 0, 2)
        ZEND_ARG_INFO(0, result_id)
        ZEND_ARG_INFO(0, field_name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_autocommit, 0, 0, 1)
        ZEND_ARG_INFO(0, connection_id)
        ZEND_ARG_INFO(0, onoff)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_commit, 0, 0, 1)
        ZEND_ARG_INFO(0, connection_id)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_rollback, 0, 0, 1)
        ZEND_ARG_INFO(0, connection_id)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_error, 0, 0, 0)
        ZEND_ARG_INFO(0, connection_id)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_errormsg, 0, 0, 0)
        ZEND_ARG_INFO(0, connection_id)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_setoption, 0, 0, 4)
        ZEND_ARG_INFO(0, conn_id)
        ZEND_ARG_INFO(0, which)
@@ -261,7 +229,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_setoption, 0, 0, 4)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_tables, 0, 0, 1)
        ZEND_ARG_INFO(0, connection_id)
        ZEND_ARG_INFO(0, qualifier)
@@ -270,7 +237,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_tables, 0, 0, 1)
        ZEND_ARG_INFO(0, table_types)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_columns, 0, 0, 1)
        ZEND_ARG_INFO(0, connection_id)
        ZEND_ARG_INFO(0, qualifier)
@@ -279,13 +245,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_columns, 0, 0, 1)
        ZEND_ARG_INFO(0, column_name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_gettypeinfo, 0, 0, 1)
        ZEND_ARG_INFO(0, connection_id)
        ZEND_ARG_INFO(0, data_type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_primarykeys, 0, 0, 4)
        ZEND_ARG_INFO(0, connection_id)
        ZEND_ARG_INFO(0, qualifier)
@@ -295,7 +259,6 @@ ZEND_END_ARG_INFO()
 
 #if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35)
 #if !defined(HAVE_BIRDSTEP)
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_procedurecolumns, 0, 0, 1)
        ZEND_ARG_INFO(0, connection_id)
        ZEND_ARG_INFO(0, qualifier)
@@ -305,7 +268,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_procedurecolumns, 0, 0, 1)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_procedures, 0, 0, 1)
        ZEND_ARG_INFO(0, connection_id)
        ZEND_ARG_INFO(0, qualifier)
@@ -313,7 +275,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_procedures, 0, 0, 1)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_foreignkeys, 0, 0, 7)
        ZEND_ARG_INFO(0, connection_id)
        ZEND_ARG_INFO(0, pk_qualifier)
@@ -325,7 +286,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_foreignkeys, 0, 0, 7)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_specialcolumns, 0, 0, 7)
        ZEND_ARG_INFO(0, connection_id)
        ZEND_ARG_INFO(0, type)
@@ -336,7 +296,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_specialcolumns, 0, 0, 7)
        ZEND_ARG_INFO(0, nullable)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_statistics, 0, 0, 6)
        ZEND_ARG_INFO(0, connection_id)
        ZEND_ARG_INFO(0, qualifier)
@@ -347,7 +306,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_statistics, 0, 0, 6)
 ZEND_END_ARG_INFO()
 
 #if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) &&!defined(HAVE_SOLID_35) && !defined(HAVE_BIRDSTEP)
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_tableprivileges, 0, 0, 4)
        ZEND_ARG_INFO(0, connection_id)
        ZEND_ARG_INFO(0, qualifier)
@@ -355,7 +313,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_tableprivileges, 0, 0, 4)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_odbc_columnprivileges, 0, 0, 5)
        ZEND_ARG_INFO(0, connection_id)
        ZEND_ARG_INFO(0, catalog)

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index e461390f70c76e0d8ce25846d59944a58f6d0e91..1002f19b1cd07939e97440248711855de396fc01 100644 (file)
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -93,33 +93,28 @@ PHP_FUNCTION(openssl_decrypt);
 PHP_FUNCTION(openssl_dh_compute_key);
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_x509_export_to_file, 0, 0, 2)
     ZEND_ARG_INFO(0, x509)
     ZEND_ARG_INFO(0, outfilename)
     ZEND_ARG_INFO(0, notext)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_x509_export, 0, 0, 2)
     ZEND_ARG_INFO(0, x509)
     ZEND_ARG_INFO(1, out)
     ZEND_ARG_INFO(0, notext)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_openssl_x509_check_private_key, 0)
     ZEND_ARG_INFO(0, cert)
     ZEND_ARG_INFO(0, key)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_openssl_x509_parse, 0)
     ZEND_ARG_INFO(0, x509)
     ZEND_ARG_INFO(0, shortname)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_x509_checkpurpose, 0, 0, 3)
     ZEND_ARG_INFO(0, x509cert)
     ZEND_ARG_INFO(0, purpose)
@@ -127,17 +122,14 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_x509_checkpurpose, 0, 0, 3)
     ZEND_ARG_INFO(0, untrustedfile)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_openssl_x509_read, 0)
     ZEND_ARG_INFO(0, cert)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_openssl_x509_free, 0)
     ZEND_ARG_INFO(0, x509)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkcs12_export_to_file, 0, 0, 4)
     ZEND_ARG_INFO(0, x509)
     ZEND_ARG_INFO(0, filename)
@@ -146,7 +138,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkcs12_export_to_file, 0, 0, 4)
     ZEND_ARG_INFO(0, args) /* array */
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_openssl_pkcs12_export, 0)
     ZEND_ARG_INFO(0, x509)
     ZEND_ARG_INFO(1, out)
@@ -155,28 +146,24 @@ ZEND_BEGIN_ARG_INFO(arginfo_openssl_pkcs12_export, 0)
     ZEND_ARG_INFO(0, args) /* array */
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_openssl_pkcs12_read, 0)
     ZEND_ARG_INFO(0, PKCS12)
     ZEND_ARG_INFO(1, certs) /* array */
     ZEND_ARG_INFO(0, pass)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_csr_export_to_file, 0, 0, 2)
     ZEND_ARG_INFO(0, csr)
     ZEND_ARG_INFO(0, outfilename)
     ZEND_ARG_INFO(0, notext)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_csr_export, 0, 0, 2)
     ZEND_ARG_INFO(0, csr)
     ZEND_ARG_INFO(1, out)
     ZEND_ARG_INFO(0, notext)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_csr_sign, 0, 0, 4)
     ZEND_ARG_INFO(0, csr)
     ZEND_ARG_INFO(0, x509)
@@ -186,7 +173,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_csr_sign, 0, 0, 4)
     ZEND_ARG_INFO(0, serial)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_csr_new, 0, 0, 2)
     ZEND_ARG_INFO(0, dn) /* array */
     ZEND_ARG_INFO(1, privkey)
@@ -194,22 +180,18 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_csr_new, 0, 0, 2)
     ZEND_ARG_INFO(0, extraattribs)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_openssl_csr_get_subject, 0)
     ZEND_ARG_INFO(0, csr)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_openssl_csr_get_public_key, 0)
     ZEND_ARG_INFO(0, csr)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkey_new, 0, 0, 0)
     ZEND_ARG_INFO(0, configargs) /* array */
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkey_export_to_file, 0, 0, 2)
     ZEND_ARG_INFO(0, key)
     ZEND_ARG_INFO(0, outfilename)
@@ -217,7 +199,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkey_export_to_file, 0, 0, 2)
     ZEND_ARG_INFO(0, config_args) /* array */
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkey_export, 0, 0, 2)
     ZEND_ARG_INFO(0, key)
     ZEND_ARG_INFO(1, out)
@@ -225,28 +206,23 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkey_export, 0, 0, 2)
     ZEND_ARG_INFO(0, config_args) /* array */
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_openssl_pkey_get_public, 0)
     ZEND_ARG_INFO(0, cert)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_openssl_pkey_free, 0)
     ZEND_ARG_INFO(0, key)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkey_get_private, 0, 0, 1)
     ZEND_ARG_INFO(0, key)
     ZEND_ARG_INFO(0, passphrase)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_openssl_pkey_get_details, 0)
     ZEND_ARG_INFO(0, key)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkcs7_verify, 0, 0, 2)
     ZEND_ARG_INFO(0, filename)
     ZEND_ARG_INFO(0, flags)
@@ -256,7 +232,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkcs7_verify, 0, 0, 2)
     ZEND_ARG_INFO(0, content)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkcs7_encrypt, 0, 0, 4)
     ZEND_ARG_INFO(0, infile)
     ZEND_ARG_INFO(0, outfile)
@@ -266,7 +241,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkcs7_encrypt, 0, 0, 4)
     ZEND_ARG_INFO(0, cipher)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkcs7_sign, 0, 0, 5)
     ZEND_ARG_INFO(0, infile)
     ZEND_ARG_INFO(0, outfile)
@@ -277,7 +251,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkcs7_sign, 0, 0, 5)
     ZEND_ARG_INFO(0, extracertsfilename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkcs7_decrypt, 0, 0, 3)
     ZEND_ARG_INFO(0, infilename)
     ZEND_ARG_INFO(0, outfilename)
@@ -285,7 +258,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_pkcs7_decrypt, 0, 0, 3)
     ZEND_ARG_INFO(0, recipkey)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_private_encrypt, 0, 0, 3)
     ZEND_ARG_INFO(0, data)
     ZEND_ARG_INFO(1, crypted)
@@ -293,7 +265,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_private_encrypt, 0, 0, 3)
     ZEND_ARG_INFO(0, padding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_private_decrypt, 0, 0, 3)
     ZEND_ARG_INFO(0, data)
     ZEND_ARG_INFO(1, crypted)
@@ -301,7 +272,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_private_decrypt, 0, 0, 3)
     ZEND_ARG_INFO(0, padding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_public_encrypt, 0, 0, 3)
     ZEND_ARG_INFO(0, data)
     ZEND_ARG_INFO(1, crypted)
@@ -309,7 +279,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_public_encrypt, 0, 0, 3)
     ZEND_ARG_INFO(0, padding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_public_decrypt, 0, 0, 3)
     ZEND_ARG_INFO(0, data)
     ZEND_ARG_INFO(1, crypted)
@@ -317,11 +286,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_public_decrypt, 0, 0, 3)
     ZEND_ARG_INFO(0, padding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_openssl_error_string, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_sign, 0, 0, 3)
     ZEND_ARG_INFO(0, data)
     ZEND_ARG_INFO(1, signature)
@@ -329,7 +296,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_sign, 0, 0, 3)
     ZEND_ARG_INFO(0, method)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_verify, 0, 0, 3)
     ZEND_ARG_INFO(0, data)
     ZEND_ARG_INFO(0, signature)
@@ -337,7 +303,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_verify, 0, 0, 3)
     ZEND_ARG_INFO(0, method)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_openssl_seal, 0)
     ZEND_ARG_INFO(0, data)
     ZEND_ARG_INFO(1, sealdata)
@@ -345,7 +310,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_openssl_seal, 0)
     ZEND_ARG_INFO(0, pubkeys) /* array */
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_openssl_open, 0)
     ZEND_ARG_INFO(0, data)
     ZEND_ARG_INFO(1, opendata)
@@ -353,24 +317,20 @@ ZEND_BEGIN_ARG_INFO(arginfo_openssl_open, 0)
     ZEND_ARG_INFO(0, privkey)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_get_md_methods, 0, 0, 0)
     ZEND_ARG_INFO(0, aliases)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_get_cipher_methods, 0, 0, 0)
     ZEND_ARG_INFO(0, aliases)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_digest, 0, 0, 2)
     ZEND_ARG_INFO(0, data)
     ZEND_ARG_INFO(0, method)
     ZEND_ARG_INFO(0, raw_output)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_encrypt, 0, 0, 3)
     ZEND_ARG_INFO(0, data)
     ZEND_ARG_INFO(0, method)
@@ -378,7 +338,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_encrypt, 0, 0, 3)
     ZEND_ARG_INFO(0, raw_output)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_decrypt, 0, 0, 3)
     ZEND_ARG_INFO(0, data)
     ZEND_ARG_INFO(0, method)
@@ -386,7 +345,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_decrypt, 0, 0, 3)
     ZEND_ARG_INFO(0, raw_input)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_openssl_dh_compute_key, 0)
     ZEND_ARG_INFO(0, pub_key)
     ZEND_ARG_INFO(0, dh_key)

diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
index 6bc6241aa98c0ffdd4ed213ceffdc02a79a50e81..07d46a0f2e147e48ce8dc4b5ff993e17cac875d3 100755 (executable)
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
@@ -48,43 +48,36 @@ ZEND_DECLARE_MODULE_GLOBALS(pcntl)
 static PHP_GINIT_FUNCTION(pcntl);
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_pcntl_void, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_waitpid, 0, 0, 2)
        ZEND_ARG_INFO(0, pid)
        ZEND_ARG_INFO(1, status)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_wait, 0, 0, 1)
        ZEND_ARG_INFO(1, status)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_signal, 0, 0, 2)
        ZEND_ARG_INFO(0, signo)
        ZEND_ARG_INFO(0, handler)
        ZEND_ARG_INFO(0, restart_syscalls)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_sigprocmask, 0, 0, 2)
        ZEND_ARG_INFO(0, how)
        ZEND_ARG_INFO(0, set)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_sigwaitinfo, 0, 0, 1)
        ZEND_ARG_INFO(0, set)
        ZEND_ARG_INFO(1, info)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_sigtimedwait, 0, 0, 1)
        ZEND_ARG_INFO(0, set)
        ZEND_ARG_INFO(1, info)
@@ -92,50 +85,41 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_sigtimedwait, 0, 0, 1)
        ZEND_ARG_INFO(0, nanoseconds)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_wifexited, 0, 0, 1)
        ZEND_ARG_INFO(0, status)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_wifstopped, 0, 0, 1)
        ZEND_ARG_INFO(0, status)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_wifsignaled, 0, 0, 1)
        ZEND_ARG_INFO(0, status)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_wifexitstatus, 0, 0, 1)
        ZEND_ARG_INFO(0, status)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_wtermsig, 0, 0, 1)
        ZEND_ARG_INFO(0, status)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_wstopsig, 0, 0, 1)
        ZEND_ARG_INFO(0, status)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_exec, 0, 0, 1)
        ZEND_ARG_INFO(0, path)
        ZEND_ARG_INFO(0, args)
        ZEND_ARG_INFO(0, envs)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_alarm, 0, 0, 1)
        ZEND_ARG_INFO(0, seconds)
 ZEND_END_ARG_INFO()
 
 #ifdef HAVE_GETPRIORITY
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_getpriority, 0, 0, 0)
        ZEND_ARG_INFO(0, pid)
        ZEND_ARG_INFO(0, process_identifier)
@@ -143,7 +127,6 @@ ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_SETPRIORITY
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pcntl_setpriority, 0, 0, 1)
        ZEND_ARG_INFO(0, priority)
        ZEND_ARG_INFO(0, pid)

diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index e03ffb3ad5d6a21433de2542c159546d68376b59..e0fa88600cb6ef59e580c2ee1a45ad87b5caf6db 100644 (file)
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -2052,7 +2052,6 @@ static PHP_FUNCTION(preg_last_error)
 /* {{{ module definition structures */
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_match, 0, 0, 2)
     ZEND_ARG_INFO(0, pattern)
     ZEND_ARG_INFO(0, subject)
@@ -2061,7 +2060,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_match, 0, 0, 2)
     ZEND_ARG_INFO(0, offset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_match_all, 0, 0, 3)
     ZEND_ARG_INFO(0, pattern)
     ZEND_ARG_INFO(0, subject)
@@ -2070,7 +2068,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_match_all, 0, 0, 3)
     ZEND_ARG_INFO(0, offset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_replace, 0, 0, 2)
     ZEND_ARG_INFO(0, regex)
     ZEND_ARG_INFO(0, replace)
@@ -2079,7 +2076,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_replace, 0, 0, 2)
     ZEND_ARG_INFO(1, count)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_replace_callback, 0, 0, 3)
     ZEND_ARG_INFO(0, regex)
     ZEND_ARG_INFO(0, callback)
@@ -2088,7 +2084,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_replace_callback, 0, 0, 3)
     ZEND_ARG_INFO(1, count)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_split, 0, 0, 2)
     ZEND_ARG_INFO(0, pattern)
     ZEND_ARG_INFO(0, subject)
@@ -2096,20 +2091,17 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_split, 0, 0, 2)
     ZEND_ARG_INFO(0, flags) 
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_quote, 0, 0, 1)
     ZEND_ARG_INFO(0, str)
     ZEND_ARG_INFO(0, delim_char)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_grep, 0, 0, 2)
     ZEND_ARG_INFO(0, regex)
     ZEND_ARG_INFO(0, input) /* array */
     ZEND_ARG_INFO(0, flags)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_preg_last_error, 0)
 ZEND_END_ARG_INFO()
 /* }}} */

diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c
index a328fd682cbe7ebf082be55b0a0e20ecb954d740..525853899b8764a65a81c0f3f19a3afd8d63d144 100755 (executable)
--- a/ext/pdo/pdo.c
+++ b/ext/pdo/pdo.c
@@ -118,7 +118,6 @@ PHP_FUNCTION(pdo_drivers)
 /* }}} */
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_pdo_drivers, 0)
 ZEND_END_ARG_INFO()
 /* }}} */

diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index 41b87baa02516ab7e6954420162777a101687c8c..23ee4758db21e5467a4e770c1f7b35ce8edfcebc 100755 (executable)
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -38,44 +38,37 @@
 #include "php_memory_streams.h"
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_execute, 0, 0, 0)
        ZEND_ARG_INFO(0, bound_input_params) /* array */
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_fetch, 0, 0, 0)
        ZEND_ARG_INFO(0, how)
        ZEND_ARG_INFO(0, orientation)
        ZEND_ARG_INFO(0, offset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_fetchobject, 0, 0, 0)
        ZEND_ARG_INFO(0, class_name)
        ZEND_ARG_INFO(0, ctor_args) /* array */
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_fetchcolumn, 0, 0, 0)
        ZEND_ARG_INFO(0, column_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_fetchall, 0, 0, 0)
        ZEND_ARG_INFO(0, how)
        ZEND_ARG_INFO(0, class_name)
        ZEND_ARG_INFO(0, ctor_args) /* array */
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_bindvalue, 0, 0, 2)
        ZEND_ARG_INFO(0, paramno)
        ZEND_ARG_INFO(0, param)
        ZEND_ARG_INFO(0, type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_bindparam, 0, 0, 2)
        ZEND_ARG_INFO(0, paramno)
        ZEND_ARG_INFO(1, param)
@@ -84,7 +77,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_bindparam, 0, 0, 2)
        ZEND_ARG_INFO(0, driverdata)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_bindcolumn, 0, 0, 2)
        ZEND_ARG_INFO(0, column)
        ZEND_ARG_INFO(1, param)
@@ -93,23 +85,19 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_bindcolumn, 0, 0, 2)
        ZEND_ARG_INFO(0, driverdata)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_pdostatement_setattribute, 0)
        ZEND_ARG_INFO(0, attribute)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_pdostatement_getattribute, 0)
        ZEND_ARG_INFO(0, attribute)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_pdostatement_getcolumnmeta, 0)
        ZEND_ARG_INFO(0, column)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pdostatement_setfetchmode, 0, 0, 1)
        ZEND_ARG_INFO(0, mode)
        ZEND_ARG_INFO(0, params)

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 02d36e7b64d9980506ceba8613f16e978d0e6a3b..ff9a27dff2603c7c3302314bc857eb41ee15920b 100644 (file)
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -90,7 +90,6 @@ ZEND_DECLARE_MODULE_GLOBALS(pgsql)
 static PHP_GINIT_FUNCTION(pgsql);
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_connect, 0, 0, 1)
        ZEND_ARG_INFO(0, connection_string)
        ZEND_ARG_INFO(0, connect_type)
@@ -101,7 +100,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_connect, 0, 0, 1)
        ZEND_ARG_INFO(0, database)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_pconnect, 0, 0, 1)
        ZEND_ARG_INFO(0, connection_string)
        ZEND_ARG_INFO(0, host)
@@ -112,66 +110,54 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_pconnect, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 #if HAVE_PQPARAMETERSTATUS
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_parameter_status, 0, 0, 1)
        ZEND_ARG_INFO(0, connection)
        ZEND_ARG_INFO(0, param_name)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_close, 0, 0, 0)
        ZEND_ARG_INFO(0, connection)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_dbname, 0, 0, 0)
        ZEND_ARG_INFO(0, connection)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_last_error, 0, 0, 0)
        ZEND_ARG_INFO(0, connection)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_options, 0, 0, 0)
        ZEND_ARG_INFO(0, connection)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_port, 0, 0, 0)
        ZEND_ARG_INFO(0, connection)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_tty, 0, 0, 0)
        ZEND_ARG_INFO(0, connection)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_host, 0, 0, 0)
        ZEND_ARG_INFO(0, connection)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_version, 0, 0, 0)
        ZEND_ARG_INFO(0, connection)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_ping, 0, 0, 0)
        ZEND_ARG_INFO(0, connection)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_query, 0, 0, 0)
        ZEND_ARG_INFO(0, connection)
        ZEND_ARG_INFO(0, query)
 ZEND_END_ARG_INFO()
 
 #if HAVE_PQEXECPARAMS
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_query_params, 0, 0, 0)
        ZEND_ARG_INFO(0, connection)
        ZEND_ARG_INFO(0, query)
@@ -180,7 +166,6 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if HAVE_PQPREPARE
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_prepare, 0, 0, 0)
        ZEND_ARG_INFO(0, connection)
        ZEND_ARG_INFO(0, stmtname)
@@ -189,7 +174,6 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if HAVE_PQEXECPREPARED
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_execute, 0, 0, 0)
        ZEND_ARG_INFO(0, connection)
        ZEND_ARG_INFO(0, stmtname)
@@ -197,30 +181,25 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_execute, 0, 0, 0)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_num_rows, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_num_fields, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
 #if HAVE_PQCMDTUPLES
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_affected_rows, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_last_notice, 0, 0, 1)
        ZEND_ARG_INFO(0, connection)
 ZEND_END_ARG_INFO()
 
 #ifdef HAVE_PQFTABLE
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_field_table, 0, 0, 2)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, field_number)
@@ -228,64 +207,54 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_field_table, 0, 0, 2)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_field_name, 0, 0, 2)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, field_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_field_size, 0, 0, 2)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, field_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_field_type, 0, 0, 2)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, field_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_field_type_oid, 0, 0, 2)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, field_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_field_num, 0, 0, 2)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, field_name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_fetch_result, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, row_number)
        ZEND_ARG_INFO(0, field_name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_fetch_row, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, row)
        ZEND_ARG_INFO(0, result_type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_fetch_assoc, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, row)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_fetch_array, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, row)
        ZEND_ARG_INFO(0, result_type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_fetch_object, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, row)
@@ -294,129 +263,108 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_fetch_object, 0, 0, 1)
        ZEND_ARG_INFO(0, ctor_params)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_fetch_all, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_fetch_all_columns, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, column_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_result_seek, 0, 0, 2)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, offset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_field_prtlen, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, row)
        ZEND_ARG_INFO(0, field_name_or_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_field_is_null, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, row)
        ZEND_ARG_INFO(0, field_name_or_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_free_result, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_last_oid, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_trace, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, mode)
        ZEND_ARG_INFO(0, connection)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_untrace, 0, 0, 0)
        ZEND_ARG_INFO(0, connection)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_lo_create, 0, 0, 0)
        ZEND_ARG_INFO(0, connection)
        ZEND_ARG_INFO(0, large_object_id)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_lo_unlink, 0, 0, 0)
        ZEND_ARG_INFO(0, connection)
        ZEND_ARG_INFO(0, large_object_oid)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_lo_open, 0, 0, 0)
        ZEND_ARG_INFO(0, connection)
        ZEND_ARG_INFO(0, large_object_oid)
        ZEND_ARG_INFO(0, mode)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_lo_close, 0, 0, 1)
        ZEND_ARG_INFO(0, large_object)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_lo_read, 0, 0, 1)
        ZEND_ARG_INFO(0, large_object)
        ZEND_ARG_INFO(0, len)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_lo_write, 0, 0, 2)
        ZEND_ARG_INFO(0, large_object)
        ZEND_ARG_INFO(0, buf)
        ZEND_ARG_INFO(0, len)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_lo_read_all, 0, 0, 1)
        ZEND_ARG_INFO(0, large_object)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_lo_import, 0, 0, 0)
        ZEND_ARG_INFO(0, connection)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, large_object_oid)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_lo_export, 0, 0, 0)
        ZEND_ARG_INFO(0, connection)
        ZEND_ARG_INFO(0, objoid)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_lo_seek, 0, 0, 2)
        ZEND_ARG_INFO(0, large_object)
        ZEND_ARG_INFO(0, offset)
        ZEND_ARG_INFO(0, whence)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_lo_tell, 0, 0, 1)
        ZEND_ARG_INFO(0, large_object)
 ZEND_END_ARG_INFO()
 
 #if HAVE_PQSETERRORVERBOSITY
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_set_error_verbosity, 0, 0, 0)
        ZEND_ARG_INFO(0, connection)
        ZEND_ARG_INFO(0, verbosity)
@@ -424,30 +372,25 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if HAVE_PQCLIENTENCODING
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_set_client_encoding, 0, 0, 0)
        ZEND_ARG_INFO(0, connection)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_client_encoding, 0, 0, 0)
        ZEND_ARG_INFO(0, connection)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_end_copy, 0, 0, 0)
        ZEND_ARG_INFO(0, connection)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_put_line, 0, 0, 0)
        ZEND_ARG_INFO(0, connection)
        ZEND_ARG_INFO(0, query)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_copy_to, 0, 0, 2)
        ZEND_ARG_INFO(0, connection)
        ZEND_ARG_INFO(0, table_name)
@@ -455,7 +398,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_copy_to, 0, 0, 2)
        ZEND_ARG_INFO(0, null_as)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_copy_from, 0, 0, 3)
        ZEND_ARG_INFO(0, connection)
        ZEND_ARG_INFO(0, table_name)
@@ -465,72 +407,60 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_copy_from, 0, 0, 3)
 ZEND_END_ARG_INFO()
 
 #if HAVE_PQESCAPE
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_escape_string, 0, 0, 0)
        ZEND_ARG_INFO(0, connection)
        ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_escape_bytea, 0, 0, 0)
        ZEND_ARG_INFO(0, connection)
        ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_unescape_bytea, 0, 0, 1)
        ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_result_error, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
 #if HAVE_PQRESULTERRORFIELD
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_result_error_field, 0, 0, 2)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, fieldcode)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_connection_status, 0, 0, 1)
        ZEND_ARG_INFO(0, connnection)
 ZEND_END_ARG_INFO()
 
 #if HAVE_PGTRANSACTIONSTATUS
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_transaction_status, 0, 0, 1)
        ZEND_ARG_INFO(0, connnection)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_connection_reset, 0, 0, 1)
        ZEND_ARG_INFO(0, connection)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_cancel_query, 0, 0, 1)
        ZEND_ARG_INFO(0, connection)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_connection_busy, 0, 0, 1)
        ZEND_ARG_INFO(0, connection)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_send_query, 0, 0, 2)
        ZEND_ARG_INFO(0, connection)
        ZEND_ARG_INFO(0, query)
 ZEND_END_ARG_INFO()
 
 #if HAVE_PQSENDQUERYPARAMS
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_send_query_params, 0, 0, 3)
        ZEND_ARG_INFO(0, connection)
        ZEND_ARG_INFO(0, query)
@@ -539,7 +469,6 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if HAVE_PQSENDPREPARE
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_send_prepare, 0, 0, 3)
        ZEND_ARG_INFO(0, connection)
        ZEND_ARG_INFO(0, stmtname)
@@ -548,7 +477,6 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if HAVE_PQSENDQUERYPREPARED
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_send_execute, 0, 0, 3)
        ZEND_ARG_INFO(0, connection)
        ZEND_ARG_INFO(0, stmtname)
@@ -556,35 +484,29 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_send_execute, 0, 0, 3)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_get_result, 0, 0, 1)
        ZEND_ARG_INFO(0, connection)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_result_status, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, result_type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_get_notify, 0, 0, 0)
        ZEND_ARG_INFO(0, connection)
        ZEND_ARG_INFO(0, e)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_get_pid, 0, 0, 0)
        ZEND_ARG_INFO(0, connection)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_meta_data, 0, 0, 2)
        ZEND_ARG_INFO(0, db)
        ZEND_ARG_INFO(0, table)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_convert, 0, 0, 3)
        ZEND_ARG_INFO(0, db)
        ZEND_ARG_INFO(0, table)
@@ -592,7 +514,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_convert, 0, 0, 3)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_insert, 0, 0, 3)
        ZEND_ARG_INFO(0, db)
        ZEND_ARG_INFO(0, table)
@@ -600,7 +521,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_insert, 0, 0, 3)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_update, 0, 0, 4)
        ZEND_ARG_INFO(0, db)
        ZEND_ARG_INFO(0, table)
@@ -609,7 +529,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_update, 0, 0, 4)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_delete, 0, 0, 3)
        ZEND_ARG_INFO(0, db)
        ZEND_ARG_INFO(0, table)
@@ -617,7 +536,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_delete, 0, 0, 3)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_select, 0, 0, 3)
        ZEND_ARG_INFO(0, db)
        ZEND_ARG_INFO(0, table)

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index bdd219a566f2802074e1717d2cb0ea04b6224639..e2261b95354236ca79d8d4336e33f51ee766c08d 100755 (executable)
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -4945,7 +4945,6 @@ PHP_METHOD(PharFileInfo, decompress)
 
 /* {{{ phar methods */
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar___construct, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, flags)
@@ -4953,36 +4952,30 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phar___construct, 0, 0, 1)
        ZEND_ARG_INFO(0, fileformat)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_createDS, 0, 0, 0)
        ZEND_ARG_INFO(0, index)
        ZEND_ARG_INFO(0, webindex)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_loadPhar, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, alias)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_mapPhar, 0, 0, 0)
        ZEND_ARG_INFO(0, alias)
        ZEND_ARG_INFO(0, offset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_mount, 0, 0, 2)
        ZEND_ARG_INFO(0, inphar)
        ZEND_ARG_INFO(0, externalfile)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_mungServer, 0, 0, 1)
        ZEND_ARG_INFO(0, munglist)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_webPhar, 0, 0, 0)
        ZEND_ARG_INFO(0, alias)
        ZEND_ARG_INFO(0, index)
@@ -4991,127 +4984,105 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_webPhar, 0, 0, 0)
        ZEND_ARG_INFO(0, rewrites)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_running, 0, 0, 1)
        ZEND_ARG_INFO(0, retphar)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_ua, 0, 0, 1)
        ZEND_ARG_INFO(0, archive)
 ZEND_END_ARG_INFO()
 
 #if HAVE_SPL
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_build, 0, 0, 1)
        ZEND_ARG_INFO(0, iterator)
        ZEND_ARG_INFO(0, base_directory)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_conv, 0, 0, 0)
        ZEND_ARG_INFO(0, format)
        ZEND_ARG_INFO(0, compression_type)
        ZEND_ARG_INFO(0, file_ext)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_comps, 0, 0, 1)
        ZEND_ARG_INFO(0, compression_type)
        ZEND_ARG_INFO(0, file_ext)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_decomp, 0, 0, 0)
        ZEND_ARG_INFO(0, file_ext)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_comp, 0, 0, 1)
        ZEND_ARG_INFO(0, compression_type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_compo, 0, 0, 0)
        ZEND_ARG_INFO(0, compression_type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_copy, 0, 0, 2)
        ZEND_ARG_INFO(0, newfile)
        ZEND_ARG_INFO(0, oldfile)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_delete, 0, 0, 1)
        ZEND_ARG_INFO(0, entry)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_fromdir, 0, 0, 1)
        ZEND_ARG_INFO(0, base_dir)
        ZEND_ARG_INFO(0, regex)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_offsetExists, 0, 0, 1)
        ZEND_ARG_INFO(0, entry)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_offsetSet, 0, 0, 2)
        ZEND_ARG_INFO(0, entry)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_setAlias, 0, 0, 1)
        ZEND_ARG_INFO(0, alias)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_setMetadata, 0, 0, 1)
        ZEND_ARG_INFO(0, metadata)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_setSigAlgo, 0, 0, 1)
        ZEND_ARG_INFO(0, algorithm)
        ZEND_ARG_INFO(0, privatekey)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_setStub, 0, 0, 1)
        ZEND_ARG_INFO(0, newstub)
        ZEND_ARG_INFO(0, maxlen)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_emptydir, 0, 0, 0)
        ZEND_ARG_INFO(0, dirname)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_extract, 0, 0, 1)
        ZEND_ARG_INFO(0, pathto)
        ZEND_ARG_INFO(0, files)
        ZEND_ARG_INFO(0, overwrite)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_addfile, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, localname)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_fromstring, 0, 0, 1)
        ZEND_ARG_INFO(0, localname)
        ZEND_ARG_INFO(0, contents)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_isff, 0, 0, 1)
        ZEND_ARG_INFO(0, fileformat)
 ZEND_END_ARG_INFO()
@@ -5184,12 +5155,10 @@ zend_function_entry php_archive_methods[] = {
 };
 
 #if HAVE_SPL
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_entry___construct, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_entry_chmod, 0, 0, 1)
        ZEND_ARG_INFO(0, perms)
 ZEND_END_ARG_INFO()

diff --git a/ext/posix/posix.c b/ext/posix/posix.c
index 10cc85ec569621828b9bb5c365e39ed59d4f39b8..3c1263e52f9942ff65717a68125204e5af4e7468 100644 (file)
--- a/ext/posix/posix.c
+++ b/ext/posix/posix.c
@@ -57,132 +57,107 @@ ZEND_DECLARE_MODULE_GLOBALS(posix)
 static PHP_MINFO_FUNCTION(posix);
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_kill, 0, 0, 2)
        ZEND_ARG_INFO(0, pid)
        ZEND_ARG_INFO(0, sig)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_posix_getpid, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_posix_getppid, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_posix_getuid, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_setuid, 0, 0, 1)
        ZEND_ARG_INFO(0, uid)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_posix_geteuid, 0)
 ZEND_END_ARG_INFO()
 
 #ifdef HAVE_SETEUID
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_seteuid, 0, 0, 1)
        ZEND_ARG_INFO(0, uid)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_posix_getgid, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_setgid, 0, 0, 1)
        ZEND_ARG_INFO(0, gid)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_posix_getegid, 0)
 ZEND_END_ARG_INFO()
 
 #ifdef HAVE_SETEGID
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_setegid, 0, 0, 1)
        ZEND_ARG_INFO(0, gid)
 ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_GETGROUPS
-static
 ZEND_BEGIN_ARG_INFO(arginfo_posix_getgroups, 0)
 ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_GETLOGIN
-static
 ZEND_BEGIN_ARG_INFO(arginfo_posix_getlogin, 0)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_posix_getpgrp, 0)
 ZEND_END_ARG_INFO()
 
 #ifdef HAVE_SETSID
-static
 ZEND_BEGIN_ARG_INFO(arginfo_posix_setsid, 0)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_setpgid, 0, 0, 2)
        ZEND_ARG_INFO(0, pid)
        ZEND_ARG_INFO(0, pgid)
 ZEND_END_ARG_INFO()
 
 #ifdef HAVE_GETPGID
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_getpgid, 0, 0, 1)
        ZEND_ARG_INFO(0, pid)
 ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_GETSID
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_getsid, 0, 0, 1)
        ZEND_ARG_INFO(0, pid)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_posix_uname, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_posix_times, 0)
 ZEND_END_ARG_INFO()
 
 #ifdef HAVE_CTERMID
-static
 ZEND_BEGIN_ARG_INFO(arginfo_posix_ctermid, 0)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_ttyname, 0, 0, 1)
        ZEND_ARG_INFO(0, fd)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_isatty, 0, 0, 1)
        ZEND_ARG_INFO(0, fd)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_posix_getcwd, 0)
 ZEND_END_ARG_INFO()
 
 #ifdef HAVE_MKFIFO
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_mkfifo, 0, 0, 2)
        ZEND_ARG_INFO(0, pathname)
        ZEND_ARG_INFO(0, mode)
@@ -190,7 +165,6 @@ ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_MKNOD
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_mknod, 0, 0, 2)
        ZEND_ARG_INFO(0, pathname)
        ZEND_ARG_INFO(0, mode)
@@ -199,49 +173,40 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_mknod, 0, 0, 2)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_access, 0, 0, 1)
        ZEND_ARG_INFO(0, file)
        ZEND_ARG_INFO(0, mode)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_getgrnam, 0, 0, 1)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_getgrgid, 0, 0, 1)
        ZEND_ARG_INFO(0, gid)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_getpwnam, 0, 0, 1)
        ZEND_ARG_INFO(0, username)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_getpwuid, 0, 0, 1)
        ZEND_ARG_INFO(0, uid)
 ZEND_END_ARG_INFO()
 
 #ifdef HAVE_GETRLIMIT
-static
 ZEND_BEGIN_ARG_INFO(arginfo_posix_getrlimit, 0)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_posix_get_last_error, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_strerror, 0, 0, 1)
        ZEND_ARG_INFO(0, errno)
 ZEND_END_ARG_INFO()
 
 #ifdef HAVE_INITGROUPS
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_posix_initgroups, 0, 0, 2)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, base_group_id)

diff --git a/ext/pspell/pspell.c b/ext/pspell/pspell.c
index 9dfd30352e3d9fa474c8138caa6644426685597a..a2dcfbf2e6b914b04c3cd6755c816b2cec20ff9e 100644 (file)
--- a/ext/pspell/pspell.c
+++ b/ext/pspell/pspell.c
@@ -73,7 +73,6 @@ static PHP_FUNCTION(pspell_config_repl);
 static PHP_FUNCTION(pspell_config_save_repl);
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_new, 0, 0, 1)
        ZEND_ARG_INFO(0, language)
        ZEND_ARG_INFO(0, spelling)
@@ -82,7 +81,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_new, 0, 0, 1)
        ZEND_ARG_INFO(0, mode)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_new_personal, 0, 0, 2)
        ZEND_ARG_INFO(0, personal)
        ZEND_ARG_INFO(0, language)
@@ -92,53 +90,44 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_new_personal, 0, 0, 2)
        ZEND_ARG_INFO(0, mode)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_new_config, 0, 0, 1)
        ZEND_ARG_INFO(0, config)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_check, 0, 0, 2)
        ZEND_ARG_INFO(0, pspell)
        ZEND_ARG_INFO(0, word)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_suggest, 0, 0, 2)
        ZEND_ARG_INFO(0, pspell)
        ZEND_ARG_INFO(0, word)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_store_replacement, 0, 0, 3)
        ZEND_ARG_INFO(0, pspell)
        ZEND_ARG_INFO(0, misspell)
        ZEND_ARG_INFO(0, correct)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_add_to_personal, 0, 0, 2)
        ZEND_ARG_INFO(0, pspell)
        ZEND_ARG_INFO(0, word)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_add_to_session, 0, 0, 2)
        ZEND_ARG_INFO(0, pspell)
        ZEND_ARG_INFO(0, word)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_clear_session, 0, 0, 1)
        ZEND_ARG_INFO(0, pspell)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_save_wordlist, 0, 0, 1)
        ZEND_ARG_INFO(0, pspell)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_create, 0, 0, 1)
        ZEND_ARG_INFO(0, language)
        ZEND_ARG_INFO(0, spelling)
@@ -146,49 +135,41 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_create, 0, 0, 1)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_runtogether, 0, 0, 2)
        ZEND_ARG_INFO(0, conf)
        ZEND_ARG_INFO(0, runtogether)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_mode, 0, 0, 2)
        ZEND_ARG_INFO(0, conf)
        ZEND_ARG_INFO(0, mode)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_ignore, 0, 0, 2)
        ZEND_ARG_INFO(0, conf)
        ZEND_ARG_INFO(0, ignore)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_personal, 0, 0, 2)
        ZEND_ARG_INFO(0, conf)
        ZEND_ARG_INFO(0, personal)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_dict_dir, 0, 0, 2)
        ZEND_ARG_INFO(0, conf)
        ZEND_ARG_INFO(0, directory)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_data_dir, 0, 0, 2)
        ZEND_ARG_INFO(0, conf)
        ZEND_ARG_INFO(0, directory)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_repl, 0, 0, 2)
        ZEND_ARG_INFO(0, conf)
        ZEND_ARG_INFO(0, repl)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pspell_config_save_repl, 0, 0, 2)
        ZEND_ARG_INFO(0, conf)
        ZEND_ARG_INFO(0, save)

diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index 2f53028e64f3b41321d41d24c33fe68c18d8f833..7a3afced93ad637cc57f4127a59e7ede3acbab31 100644 (file)
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -69,67 +69,54 @@ PHP_RSHUTDOWN_FUNCTION(readline);
 /* }}} */
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_readline, 0, 0, 0)
        ZEND_ARG_INFO(0, prompt)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_readline_info, 0, 0, 0)
        ZEND_ARG_INFO(0, varname)
        ZEND_ARG_INFO(0, newvalue)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_readline_add_history, 0, 0, 1)
        ZEND_ARG_INFO(0, prompt)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_readline_clear_history, 0)
 ZEND_END_ARG_INFO()
 
 #ifndef HAVE_LIBEDIT
-static
 ZEND_BEGIN_ARG_INFO(arginfo_readline_list_history, 0)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_readline_read_history, 0, 0, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_readline_write_history, 0, 0, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_readline_completion_function, 0, 0, 1)
        ZEND_ARG_INFO(0, funcname)
 ZEND_END_ARG_INFO()
 
 #if HAVE_RL_CALLBACK_READ_CHAR
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_readline_callback_handler_install, 0, 0, 2)
        ZEND_ARG_INFO(0, prompt)
        ZEND_ARG_INFO(0, callback)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_readline_callback_read_char, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_readline_callback_handler_remove, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_readline_redisplay, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_readline_on_new_line, 0)
 ZEND_END_ARG_INFO()
 #endif

diff --git a/ext/recode/recode.c b/ext/recode/recode.c
index 54a8aa16eeb4dac6f86e9fb29df912ff30f1d176..2f97670a7b6250bccde495742a0f7196b9068c71 100644 (file)
--- a/ext/recode/recode.c
+++ b/ext/recode/recode.c
@@ -67,13 +67,11 @@ ZEND_DECLARE_MODULE_GLOBALS(recode);
 static PHP_GINIT_FUNCTION(recode);
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_recode_string, 0, 0, 2)
        ZEND_ARG_INFO(0, request)
        ZEND_ARG_INFO(0, str)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_recode_file, 0, 0, 3)
        ZEND_ARG_INFO(0, request)
        ZEND_ARG_INFO(0, input)

diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index ae3b802dfaff45cf007c11198030563d55c143ed..de80f877716c10f47cafca7c3f00549f325b8eeb 100644 (file)
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -4924,12 +4924,10 @@ static const zend_function_entry reflection_exception_functions[] = {
 };
 
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_getModifierNames, 0)
        ZEND_ARG_INFO(0, modifiers)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_export, 0, 0, 1)
        ZEND_ARG_OBJ_INFO(0, reflector, Reflector, 0)
        ZEND_ARG_INFO(0, return)
@@ -4947,23 +4945,19 @@ static const zend_function_entry reflector_functions[] = {
        {NULL, NULL, NULL}
 };
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_function_export, 0, 0, 1)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, return)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_function___construct, 0)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_function_invoke, 0)
        ZEND_ARG_INFO(0, args)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_function_invokeArgs, 0)
        ZEND_ARG_ARRAY_INFO(0, args, 0)
 ZEND_END_ARG_INFO()
@@ -5003,26 +4997,22 @@ static const zend_function_entry reflection_function_functions[] = {
        {NULL, NULL, NULL}
 };
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_method_export, 0, 0, 2)
        ZEND_ARG_INFO(0, class)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, return)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_method___construct, 0, 0, 1)
        ZEND_ARG_INFO(0, class_or_method)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_method_invoke, 0)
        ZEND_ARG_INFO(0, object)
        ZEND_ARG_INFO(0, args)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_method_invokeArgs, 0)
        ZEND_ARG_INFO(0, object)
        ZEND_ARG_ARRAY_INFO(0, args, 0)
@@ -5050,90 +5040,73 @@ static const zend_function_entry reflection_method_functions[] = {
 };
 
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_class_export, 0, 0, 1)
        ZEND_ARG_INFO(0, argument)
        ZEND_ARG_INFO(0, return)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_class___construct, 0)
        ZEND_ARG_INFO(0, argument)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_class_getStaticPropertyValue, 0, 0, 1)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, default)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_setStaticPropertyValue, 0)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_hasMethod, 0)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_getMethod, 0)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_class_getMethods, 0, 0, 0)
        ZEND_ARG_INFO(0, filter)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_hasProperty, 0)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_getProperty, 0)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_class_getProperties, 0, 0, 0)
        ZEND_ARG_INFO(0, filter)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_hasConstant, 0)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_getConstant, 0)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_isInstance, 0)
        ZEND_ARG_INFO(0, object)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_newInstance, 0)
        ZEND_ARG_INFO(0, args)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_class_newInstanceArgs, 0, 0, 0)
        ZEND_ARG_ARRAY_INFO(0, args, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_isSubclassOf, 0)
        ZEND_ARG_INFO(0, class)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_implementsInterface, 0)
        ZEND_ARG_INFO(0, interface)
 ZEND_END_ARG_INFO()
@@ -5187,13 +5160,11 @@ static const zend_function_entry reflection_class_functions[] = {
 };
 
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_object_export, 0, 0, 1)
        ZEND_ARG_INFO(0, argument)
        ZEND_ARG_INFO(0, return)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_object___construct, 0)
        ZEND_ARG_INFO(0, argument)
 ZEND_END_ARG_INFO()
@@ -5205,29 +5176,24 @@ static const zend_function_entry reflection_object_functions[] = {
 };
 
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_property_export, 0, 0, 1)
        ZEND_ARG_INFO(0, argument)
        ZEND_ARG_INFO(0, return)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_property___construct, 0)
        ZEND_ARG_INFO(0, argument)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_property_getValue, 0, 0, 0)
        ZEND_ARG_INFO(0, object)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_property_setValue, 0)
        ZEND_ARG_INFO(0, object)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_property_setAccessible, 0)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
@@ -5253,14 +5219,12 @@ static const zend_function_entry reflection_property_functions[] = {
        {NULL, NULL, NULL}
 };
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_parameter_export, 0, 0, 2)
        ZEND_ARG_INFO(0, function)
        ZEND_ARG_INFO(0, parameter)
        ZEND_ARG_INFO(0, return)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_parameter___construct, 0)
        ZEND_ARG_INFO(0, function)
        ZEND_ARG_INFO(0, parameter)
@@ -5285,13 +5249,11 @@ static const zend_function_entry reflection_parameter_functions[] = {
        {NULL, NULL, NULL}
 };
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_extension_export, 0, 0, 1)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, return)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_reflection_extension___construct, 0)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()

diff --git a/ext/session/session.c b/ext/session/session.c
index 2c1c8a3d976ae84a6f1c6915fb03d624ccfec636..f4d67b32063f25e99ca24dd2eb5b009c2d948f9d 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -1861,41 +1861,33 @@ static PHP_FUNCTION(session_write_close)
 /* }}} */
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_session_name, 0, 0, 0)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_session_module_name, 0, 0, 0)
        ZEND_ARG_INFO(0, module)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_session_save_path, 0, 0, 0)
        ZEND_ARG_INFO(0, path)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_session_id, 0, 0, 0)
        ZEND_ARG_INFO(0, id)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_session_regenerate_id, 0, 0, 0)
        ZEND_ARG_INFO(0, delete_old_session)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_session_decode, 0, 0, 1)
        ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_session_void, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_session_set_save_handler, 0, 0, 6)
        ZEND_ARG_INFO(0, open)
        ZEND_ARG_INFO(0, close)
@@ -1905,17 +1897,14 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_session_set_save_handler, 0, 0, 6)
        ZEND_ARG_INFO(0, gc)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_session_cache_limiter, 0, 0, 0)
        ZEND_ARG_INFO(0, cache_limiter)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_session_cache_expire, 0, 0, 0)
        ZEND_ARG_INFO(0, new_cache_expire)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_session_set_cookie_params, 0, 0, 1)
        ZEND_ARG_INFO(0, lifetime)
        ZEND_ARG_INFO(0, path)

diff --git a/ext/shmop/shmop.c b/ext/shmop/shmop.c
index e7e2de6aa1b09cb454687e8a0fbe906a2c6d4027..e568d4ebbea70293bd8e3db032574580f98b7ac4 100644 (file)
--- a/ext/shmop/shmop.c
+++ b/ext/shmop/shmop.c
@@ -46,7 +46,6 @@ php_shmop_globals shmop_globals;
 int shm_type;
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_shmop_open, 0, 0, 4)
        ZEND_ARG_INFO(0, key)
        ZEND_ARG_INFO(0, flags)
@@ -54,31 +53,26 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_shmop_open, 0, 0, 4)
        ZEND_ARG_INFO(0, size)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_shmop_read, 0, 0, 3)
        ZEND_ARG_INFO(0, shmid)
        ZEND_ARG_INFO(0, start)
        ZEND_ARG_INFO(0, count)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_shmop_close, 0, 0, 1)
        ZEND_ARG_INFO(0, shmid)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_shmop_size, 0, 0, 1)
        ZEND_ARG_INFO(0, shmid)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_shmop_write, 0, 0, 3)
        ZEND_ARG_INFO(0, shmid)
        ZEND_ARG_INFO(0, data)
        ZEND_ARG_INFO(0, offset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_shmop_delete, 0, 0, 1)
        ZEND_ARG_INFO(0, shmid)
 ZEND_END_ARG_INFO()

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index 3f71bbdb82c6d31b2a9d6a65d587f3d2c2948814..c255306b2c9a29a8f08d2c27ab2e70501d9fc666 100644 (file)
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -2521,7 +2521,6 @@ PHP_FUNCTION(simplexml_import_dom)
 /* }}} */
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_simplexml_load_file, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, class_name)
@@ -2530,7 +2529,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_simplexml_load_file, 0, 0, 1)
        ZEND_ARG_INFO(0, is_prefix)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_simplexml_load_string, 0, 0, 1)
        ZEND_ARG_INFO(0, data)
        ZEND_ARG_INFO(0, class_name)
@@ -2539,7 +2537,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_simplexml_load_string, 0, 0, 1)
        ZEND_ARG_INFO(0, is_prefix)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_simplexml_import_dom, 0, 0, 1)
        ZEND_ARG_INFO(0, node)
        ZEND_ARG_INFO(0, class_name)

diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c
index 8202f8746c7d616ffb42f90207c19b1fd0a9cd50..ea73a337099712cad131183ba4b7e5f4c0a2ed7f 100644 (file)
--- a/ext/snmp/snmp.c
+++ b/ext/snmp/snmp.c
@@ -113,7 +113,6 @@ static PHP_GINIT_FUNCTION(snmp);
 static oid objid_mib[] = {1, 3, 6, 1, 2, 1};
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_snmpget, 0, 0, 3)
        ZEND_ARG_INFO(0, host)
        ZEND_ARG_INFO(0, community)
@@ -122,7 +121,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_snmpget, 0, 0, 3)
        ZEND_ARG_INFO(0, retries)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_snmpgetnext, 0, 0, 3)
        ZEND_ARG_INFO(0, host)
        ZEND_ARG_INFO(0, community)
@@ -131,7 +129,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_snmpgetnext, 0, 0, 3)
        ZEND_ARG_INFO(0, retries)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_snmpwalk, 0, 0, 3)
        ZEND_ARG_INFO(0, host)
        ZEND_ARG_INFO(0, community)
@@ -140,7 +137,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_snmpwalk, 0, 0, 3)
        ZEND_ARG_INFO(0, retries)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_snmprealwalk, 0, 0, 3)
        ZEND_ARG_INFO(0, host)
        ZEND_ARG_INFO(0, community)
@@ -149,29 +145,24 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_snmprealwalk, 0, 0, 3)
        ZEND_ARG_INFO(0, retries)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp_get_quick_print, 0, 0, 1)
        ZEND_ARG_INFO(0, d)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp_set_quick_print, 0, 0, 1)
        ZEND_ARG_INFO(0, quick_print)
 ZEND_END_ARG_INFO()
 
 #ifdef HAVE_NET_SNMP
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp_set_enum_print, 0, 0, 1)
        ZEND_ARG_INFO(0, enum_print)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp_set_oid_output_format, 0, 0, 1)
        ZEND_ARG_INFO(0, oid_format)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_snmpset, 0, 0, 5)
        ZEND_ARG_INFO(0, host)
        ZEND_ARG_INFO(0, community)
@@ -182,7 +173,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_snmpset, 0, 0, 5)
        ZEND_ARG_INFO(0, retries)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp2_get, 0, 0, 3)
        ZEND_ARG_INFO(0, host)
        ZEND_ARG_INFO(0, community)
@@ -191,7 +181,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp2_get, 0, 0, 3)
        ZEND_ARG_INFO(0, retries)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp2_getnext, 0, 0, 3)
        ZEND_ARG_INFO(0, host)
        ZEND_ARG_INFO(0, community)
@@ -200,7 +189,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp2_getnext, 0, 0, 3)
        ZEND_ARG_INFO(0, retries)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp2_walk, 0, 0, 3)
        ZEND_ARG_INFO(0, host)
        ZEND_ARG_INFO(0, community)
@@ -209,7 +197,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp2_walk, 0, 0, 3)
        ZEND_ARG_INFO(0, retries)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp2_real_walk, 0, 0, 3)
        ZEND_ARG_INFO(0, host)
        ZEND_ARG_INFO(0, community)
@@ -218,7 +205,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp2_real_walk, 0, 0, 3)
        ZEND_ARG_INFO(0, retries)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp2_set, 0, 0, 5)
        ZEND_ARG_INFO(0, host)
        ZEND_ARG_INFO(0, community)
@@ -229,13 +215,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp2_set, 0, 0, 5)
        ZEND_ARG_INFO(0, retries)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_php_snmpv3, 0, 0, 2)
        ZEND_ARG_INFO(0, s)
        ZEND_ARG_INFO(0, st)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp3_get, 0, 0, 8)
        ZEND_ARG_INFO(0, host)
        ZEND_ARG_INFO(0, sec_name)
@@ -249,7 +233,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp3_get, 0, 0, 8)
        ZEND_ARG_INFO(0, retries)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp3_getnext, 0, 0, 8)
        ZEND_ARG_INFO(0, host)
        ZEND_ARG_INFO(0, sec_name)
@@ -263,7 +246,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp3_getnext, 0, 0, 8)
        ZEND_ARG_INFO(0, retries)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp3_walk, 0, 0, 8)
        ZEND_ARG_INFO(0, host)
        ZEND_ARG_INFO(0, sec_name)
@@ -277,7 +259,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp3_walk, 0, 0, 8)
        ZEND_ARG_INFO(0, retries)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp3_real_walk, 0, 0, 8)
        ZEND_ARG_INFO(0, host)
        ZEND_ARG_INFO(0, sec_name)
@@ -291,7 +272,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp3_real_walk, 0, 0, 8)
        ZEND_ARG_INFO(0, retries)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp3_set, 0, 0, 10)
        ZEND_ARG_INFO(0, host)
        ZEND_ARG_INFO(0, sec_name)
@@ -307,16 +287,13 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp3_set, 0, 0, 10)
        ZEND_ARG_INFO(0, retries)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp_set_valueretrieval, 0, 0, 1)
        ZEND_ARG_INFO(0, method)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_snmp_get_valueretrieval, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_snmp_read_mib, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()

diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index 40c40f305e1ae9f4cb581faf0ffd146225f64304..e8ce4ac8feb8d640d5248fc268540b5febf79d23 100644 (file)
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -204,13 +204,11 @@ PHP_METHOD(SoapHeader, SoapHeader);
 #define SOAP_CTOR(class_name, func_name, arginfo, flags) ZEND_FENTRY(__construct, ZEND_MN(class_name##_##func_name), arginfo, flags)
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_soapparam_soapparam, 0, 0, 2)
        ZEND_ARG_INFO(0, data)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_soapheader_soapheader, 0, 0, 2)
        ZEND_ARG_INFO(0, namespace)
        ZEND_ARG_INFO(0, name)
@@ -219,7 +217,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_soapheader_soapheader, 0, 0, 2)
        ZEND_ARG_INFO(0, actor)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_soapfault_soapfault, 0, 0, 2)
        ZEND_ARG_INFO(0, faultcode)
        ZEND_ARG_INFO(0, faultstring)
@@ -229,7 +226,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_soapfault_soapfault, 0, 0, 2)
        ZEND_ARG_INFO(0, headerfault)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_soapvar_soapvar, 0, 0, 2)
        ZEND_ARG_INFO(0, data)
        ZEND_ARG_INFO(0, encoding)
@@ -239,7 +235,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_soapvar_soapvar, 0, 0, 2)
        ZEND_ARG_INFO(0, node_namespace)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_soapserver_fault, 0, 0, 2)
        ZEND_ARG_INFO(0, code)
        ZEND_ARG_INFO(0, string)
@@ -248,60 +243,49 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_soapserver_fault, 0, 0, 2)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_soapserver_addsoapheader, 0, 0, 1)
        ZEND_ARG_INFO(0, object)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_soapserver_soapserver, 0, 0, 1)
        ZEND_ARG_INFO(0, wsdl)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_soapserver_setpersistence, 0, 0, 1)
        ZEND_ARG_INFO(0, mode)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_soapserver_setclass, 0, 0, 1)
        ZEND_ARG_INFO(0, class_name)
        ZEND_ARG_INFO(0, args)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_soapserver_setobject, 0, 0, 1)
        ZEND_ARG_INFO(0, object)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_soapserver_getfunctions, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_soapserver_addfunction, 0, 0, 1)
        ZEND_ARG_INFO(0, functions)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_soapserver_handle, 0, 0, 0)
        ZEND_ARG_INFO(0, soap_request)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_soapclient_soapclient, 0, 0, 1)
        ZEND_ARG_INFO(0, wsdl)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_soapclient___call, 0, 0, 2)
        ZEND_ARG_INFO(0, function_name)
        ZEND_ARG_INFO(0, arguments)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_soapclient___soapcall, 0, 0, 2)
        ZEND_ARG_INFO(0, function_name)
        ZEND_ARG_INFO(0, arguments)
@@ -310,31 +294,24 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_soapclient___soapcall, 0, 0, 2)
        ZEND_ARG_INFO(1, output_headers)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_soapclient___getfunctions, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_soapclient___gettypes, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_soapclient___getlastrequest, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_soapclient___getlastresponse, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_soapclient___getlastrequestheaders, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_soapclient___getlastresponseheaders, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_soapclient___dorequest, 0, 0, 4)
        ZEND_ARG_INFO(0, request)
        ZEND_ARG_INFO(0, location)
@@ -343,32 +320,26 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_soapclient___dorequest, 0, 0, 4)
        ZEND_ARG_INFO(0, one_way)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_soapclient___setcookie, 0, 0, 1)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_soapclient___getcookie, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_soapclient___setsoapheaders, 0, 0, 1)
        ZEND_ARG_INFO(0, soapheaders)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_soapclient___setlocation, 0, 0, 0)
        ZEND_ARG_INFO(0, new_location)
 ZEND_END_ARG_INFO()
 
-static 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_soap_use_soap_error_handler, 0, 0, 0)
        ZEND_ARG_INFO(0, handler)
 ZEND_END_ARG_INFO()
 
-static 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_soap_is_soap_fault, 0, 0, 1)
        ZEND_ARG_INFO(0, object)
 ZEND_END_ARG_INFO()

diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index cf19c883c12437d611e34017567e728ceee0e4ea..b19ee15c65845336ebc6594dc9c6e2dbc98d64aa 100644 (file)
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -98,7 +98,6 @@ static int le_socket;
 #define le_socket_name "Socket"
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_select, 0, 0, 4)
        ZEND_ARG_INFO(1, read_fds)
        ZEND_ARG_INFO(1, write_fds)
@@ -107,93 +106,78 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_select, 0, 0, 4)
        ZEND_ARG_INFO(0, tv_usec)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_create_listen, 0, 0, 1)
        ZEND_ARG_INFO(0, port)
        ZEND_ARG_INFO(0, backlog)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_accept, 0, 0, 1)
        ZEND_ARG_INFO(0, socket)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_set_nonblock, 0, 0, 1)
        ZEND_ARG_INFO(0, socket)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_set_block, 0, 0, 1)
        ZEND_ARG_INFO(0, socket)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_listen, 0, 0, 1)
        ZEND_ARG_INFO(0, socket)
        ZEND_ARG_INFO(0, backlog)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_close, 0, 0, 1)
        ZEND_ARG_INFO(0, socket)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_write, 0, 0, 2)
        ZEND_ARG_INFO(0, socket)
        ZEND_ARG_INFO(0, buf)
        ZEND_ARG_INFO(0, length)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_read, 0, 0, 2)
        ZEND_ARG_INFO(0, socket)
        ZEND_ARG_INFO(0, length)
        ZEND_ARG_INFO(0, type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_getsockname, 0, 0, 2)
        ZEND_ARG_INFO(0, socket)
        ZEND_ARG_INFO(1, addr)
        ZEND_ARG_INFO(1, port)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_getpeername, 0, 0, 2)
        ZEND_ARG_INFO(0, socket)
        ZEND_ARG_INFO(1, addr)
        ZEND_ARG_INFO(1, port)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_create, 0, 0, 3)
        ZEND_ARG_INFO(0, domain)
        ZEND_ARG_INFO(0, type)
        ZEND_ARG_INFO(0, protocol)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_connect, 0, 0, 2)
        ZEND_ARG_INFO(0, socket)
        ZEND_ARG_INFO(0, addr)
        ZEND_ARG_INFO(0, port)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_strerror, 0, 0, 1)
        ZEND_ARG_INFO(0, errno)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_bind, 0, 0, 2)
        ZEND_ARG_INFO(0, socket)
        ZEND_ARG_INFO(0, addr)
        ZEND_ARG_INFO(0, port)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_recv, 0, 0, 4)
        ZEND_ARG_INFO(0, socket)
        ZEND_ARG_INFO(1, buf)
@@ -201,7 +185,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_recv, 0, 0, 4)
        ZEND_ARG_INFO(0, flags)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_send, 0, 0, 4)
        ZEND_ARG_INFO(0, socket)
        ZEND_ARG_INFO(0, buf)
@@ -209,7 +192,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_send, 0, 0, 4)
        ZEND_ARG_INFO(0, flags)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_recvfrom, 0, 0, 5)
        ZEND_ARG_INFO(0, socket)
        ZEND_ARG_INFO(1, buf)
@@ -219,7 +201,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_recvfrom, 0, 0, 5)
        ZEND_ARG_INFO(1, port)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_sendto, 0, 0, 5)
        ZEND_ARG_INFO(0, socket)
        ZEND_ARG_INFO(0, buf)
@@ -229,14 +210,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_sendto, 0, 0, 5)
        ZEND_ARG_INFO(0, port)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_get_option, 0, 0, 3)
        ZEND_ARG_INFO(0, socket)
        ZEND_ARG_INFO(0, level)
        ZEND_ARG_INFO(0, optname)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_set_option, 0, 0, 4)
        ZEND_ARG_INFO(0, socket)
        ZEND_ARG_INFO(0, level)
@@ -245,7 +224,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_set_option, 0, 0, 4)
 ZEND_END_ARG_INFO()
 
 #ifdef HAVE_SOCKETPAIR
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_create_pair, 0, 0, 4)
        ZEND_ARG_INFO(0, domain)
        ZEND_ARG_INFO(0, type)
@@ -255,19 +233,16 @@ ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_SHUTDOWN
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_shutdown, 0, 0, 1)
        ZEND_ARG_INFO(0, socket)
        ZEND_ARG_INFO(0, how)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_last_error, 0, 0, 0)
        ZEND_ARG_INFO(0, socket)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_clear_error, 0, 0, 0)
        ZEND_ARG_INFO(0, socket)
 ZEND_END_ARG_INFO()

diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c
index 8d4c1f79350152aa122c99036566eb326dfa6aa6..955b1b357625650c18dce68bd94a0a8192c73c4d 100755 (executable)
--- a/ext/spl/php_spl.c
+++ b/ext/spl/php_spl.c
@@ -765,70 +765,57 @@ PHP_MINFO_FUNCTION(spl)
 /* }}} */
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_iterator_to_array, 0, 0, 1)
        ZEND_ARG_OBJ_INFO(0, iterator, Traversable, 0)
        ZEND_ARG_INFO(0, use_keys)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_iterator, 0)
        ZEND_ARG_OBJ_INFO(0, iterator, Traversable, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_iterator_apply, 0, 0, 2)
        ZEND_ARG_OBJ_INFO(0, iterator, Traversable, 0)
        ZEND_ARG_INFO(0, function)
        ZEND_ARG_ARRAY_INFO(0, args, 1)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_parents, 0, 0, 1)
        ZEND_ARG_INFO(0, instance)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_implements, 0, 0, 1)
        ZEND_ARG_INFO(0, what)
        ZEND_ARG_INFO(0, autoload)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_spl_classes, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_spl_autoload_functions, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_spl_autoload, 0, 0, 1)
        ZEND_ARG_INFO(0, class_name)
        ZEND_ARG_INFO(0, file_extensions)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_spl_autoload_extensions, 0, 0, 0)
        ZEND_ARG_INFO(0, file_extensions)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_spl_autoload_call, 0, 0, 1)
        ZEND_ARG_INFO(0, class_name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_spl_autoload_register, 0, 0, 0)
        ZEND_ARG_INFO(0, autoload_function)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_spl_autoload_unregister, 0, 0, 1)
        ZEND_ARG_INFO(0, autoload_function)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_spl_object_hash, 0, 0, 1)
        ZEND_ARG_INFO(0, obj)
 ZEND_END_ARG_INFO()

diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
index 29a435f4d4fb10872081e4cb2e465dbd85c3da41..2b11cf88aed4e03fe53844c390d7f357c73ab2b8 100755 (executable)
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
@@ -1734,53 +1734,43 @@ int spl_array_unserialize(zval **object, zend_class_entry *ce, int type, const z
 /* }}} */
 
 /* {{{ ZEND_BEGIN_ARG_INFO */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array___construct, 0)
        ZEND_ARG_INFO(0, array)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_array_offsetGet, 0, 0, 1)
        ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_array_offsetSet, 0, 0, 2)
        ZEND_ARG_INFO(0, index)
        ZEND_ARG_INFO(0, newval)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array_append, 0)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array_seek, 0)
        ZEND_ARG_INFO(0, position)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array_exchangeArray, 0)
        ZEND_ARG_INFO(0, array)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array_setFlags, 0)
        ZEND_ARG_INFO(0, flags)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array_setIteratorClass, 0)
        ZEND_ARG_INFO(0, iteratorClass)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array_uXsort, 0)
        ZEND_ARG_INFO(0, cmp_function)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array_unserialize, 0)
        ZEND_ARG_INFO(0, serialized)
 ZEND_END_ARG_INFO();

diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index 4b012651c5191f5a880c309379a41ce23ff31b2b..e865ff0e4bc7f26a28dbc36a5e262ba1f97d3fb3 100755 (executable)
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -1734,24 +1734,20 @@ static int spl_filesystem_object_cast(zval *readobj, zval *writeobj, int type, v
 
 /* {{{ declare method parameters */
 /* supply a name and default to call by parameter */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_info___construct, 0) 
        ZEND_ARG_INFO(0, file_name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_info_openFile, 0, 0, 0)
        ZEND_ARG_INFO(0, open_mode)
        ZEND_ARG_INFO(0, use_include_path)
        ZEND_ARG_INFO(0, context)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_info_optinalFileClass, 0, 0, 0)
        ZEND_ARG_INFO(0, class_name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_optinalSuffix, 0, 0, 0)
        ZEND_ARG_INFO(0, suffix)
 ZEND_END_ARG_INFO()
@@ -1792,12 +1788,10 @@ static const zend_function_entry spl_SplFileInfo_functions[] = {
        {NULL, NULL, NULL}
 };
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dir___construct, 0) 
        ZEND_ARG_INFO(0, path)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dir_it_seek, 0) 
        ZEND_ARG_INFO(0, position)
 ZEND_END_ARG_INFO();
@@ -1820,18 +1814,15 @@ static const zend_function_entry spl_DirectoryIterator_functions[] = {
        {NULL, NULL, NULL}
 };
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_r_dir___construct, 0, 0, 1) 
        ZEND_ARG_INFO(0, path)
        ZEND_ARG_INFO(0, flags)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_r_dir_hasChildren, 0, 0, 0)
        ZEND_ARG_INFO(0, allow_links)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_r_dir_setFlags, 0, 0, 0)
        ZEND_ARG_INFO(0, flags)
 ZEND_END_ARG_INFO()
@@ -2621,7 +2612,6 @@ SPL_METHOD(SplFileObject, seek)
 } /* }}} */
 
 /* {{{ Function/Class/Method definitions */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object___construct, 0, 0, 1)
        ZEND_ARG_INFO(0, file_name)
        ZEND_ARG_INFO(0, open_mode)
@@ -2629,56 +2619,46 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object___construct, 0, 0, 1)
        ZEND_ARG_INFO(0, context)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_file_object_setFlags, 0)
        ZEND_ARG_INFO(0, flags)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_file_object_setMaxLineLen, 0)
        ZEND_ARG_INFO(0, max_len)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fgetcsv, 0, 0, 0)
        ZEND_ARG_INFO(0, delimiter)
        ZEND_ARG_INFO(0, enclosure)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_flock, 0, 0, 1) 
        ZEND_ARG_INFO(0, operation)
        ZEND_ARG_INFO(1, wouldblock)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fseek, 0, 0, 1) 
        ZEND_ARG_INFO(0, pos)
        ZEND_ARG_INFO(0, whence)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fgetss, 0, 0, 0) 
        ZEND_ARG_INFO(0, allowable_tags)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fscanf, 0, 0, 1) 
        ZEND_ARG_INFO(0, format)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fwrite, 0, 0, 1) 
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, length)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_ftruncate, 0, 0, 1) 
        ZEND_ARG_INFO(0, size)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_seek, 0, 0, 1) 
        ZEND_ARG_INFO(0, line_pos)
 ZEND_END_ARG_INFO()
@@ -2719,7 +2699,6 @@ static const zend_function_entry spl_SplFileObject_functions[] = {
        {NULL, NULL, NULL}
 };
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_temp_file_object___construct, 0, 0, 0)
        ZEND_ARG_INFO(0, max_memory)
 ZEND_END_ARG_INFO()

diff --git a/ext/spl/spl_dllist.c b/ext/spl/spl_dllist.c
index 2b457020d6cf16c97ce92cce2dfe76d5b45db34e..a525802b049d1e9d71327ab0244ec9a87b19c5d5 100644 (file)
--- a/ext/spl/spl_dllist.c
+++ b/ext/spl/spl_dllist.c
@@ -1119,22 +1119,18 @@ zend_object_iterator *spl_dllist_get_iterator(zend_class_entry *ce, zval *object
 /* }}} */
 
 /*  Function/Class/Method definitions */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dllist_setiteratormode, 0)
        ZEND_ARG_INFO(0, flags)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dllist_push, 0)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dllist_offsetGet, 0, 0, 1)
        ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dllist_offsetSet, 0, 0, 2)
        ZEND_ARG_INFO(0, index)
        ZEND_ARG_INFO(0, newval)

diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c
index e614a5cac1715013b47b3f7270862e548f2ac541..924e246cf740313e311f39ce2c5a6281fdde027d 100644 (file)
--- a/ext/spl/spl_fixedarray.c
+++ b/ext/spl/spl_fixedarray.c
@@ -1002,23 +1002,19 @@ zend_object_iterator *spl_fixedarray_get_iterator(zend_class_entry *ce, zval *ob
 }
 /* }}} */
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fixedarray_offsetGet, 0, 0, 1)
        ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fixedarray_offsetSet, 0, 0, 2)
        ZEND_ARG_INFO(0, index)
        ZEND_ARG_INFO(0, newval)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_fixedarray_setSize, 0)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fixedarray_fromArray, 0, 0, 1)
        ZEND_ARG_INFO(0, data)
        ZEND_ARG_INFO(0, save_indexes)

diff --git a/ext/spl/spl_heap.c b/ext/spl/spl_heap.c
index afa95ebaa3fb32357491c98e69c9bf902310374f..d7a5652ede309f4c2268b8865357bce990afe5e7 100644 (file)
--- a/ext/spl/spl_heap.c
+++ b/ext/spl/spl_heap.c
@@ -1126,24 +1126,20 @@ zend_object_iterator *spl_pqueue_get_iterator(zend_class_entry *ce, zval *object
 }
 /* }}} */
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_heap_insert, 0)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_heap_compare, 0)
        ZEND_ARG_INFO(0, a)
        ZEND_ARG_INFO(0, b)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_pqueue_insert, 0)
        ZEND_ARG_INFO(0, value)
        ZEND_ARG_INFO(0, priority)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_pqueue_setflags, 0)
        ZEND_ARG_INFO(0, flags)
 ZEND_END_ARG_INFO()

diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index 084ec37fcb57ffbc70c7f85697e74e2b93d6472a..82190ba9aacc5e5e6a96940ac54be2e9f3c3b777 100755 (executable)
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -843,19 +843,16 @@ static zend_object_value spl_RecursiveTreeIterator_new(zend_class_entry *class_t
 }
 /* }}} */
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_recursive_it___construct, 0, 0, 1) 
        ZEND_ARG_OBJ_INFO(0, iterator, Traversable, 0)
        ZEND_ARG_INFO(0, mode)
        ZEND_ARG_INFO(0, flags)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_recursive_it_getSubIterator, 0, 0, 0)
        ZEND_ARG_INFO(0, level)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_recursive_it_setMaxDepth, 0, 0, 0)
        ZEND_ARG_INFO(0, max_depth)
 ZEND_END_ARG_INFO();
@@ -1150,7 +1147,6 @@ SPL_METHOD(RecursiveTreeIterator, key)
 
 } /* }}} */
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_recursive_tree_it___construct, 0, 0, 1) 
        ZEND_ARG_OBJ_INFO(0, iterator, Traversable, 0)
        ZEND_ARG_INFO(0, flags)
@@ -1158,7 +1154,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_recursive_tree_it___construct, 0, 0, 1)
        ZEND_ARG_INFO(0, mode)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_recursive_tree_it_setPrefixPart, 0, 0, 2)
        ZEND_ARG_INFO(0, part)
        ZEND_ARG_INFO(0, value)
@@ -2021,7 +2016,6 @@ static zend_object_value spl_dual_it_new(zend_class_entry *class_type TSRMLS_DC)
 }
 /* }}} */
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_filter_it___construct, 0) 
        ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0)
 ZEND_END_ARG_INFO();
@@ -2038,7 +2032,6 @@ static const zend_function_entry spl_funcs_FilterIterator[] = {
        {NULL, NULL, NULL}
 };
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_parent_it___construct, 0) 
        ZEND_ARG_OBJ_INFO(0, iterator, RecursiveIterator, 0)
 ZEND_END_ARG_INFO();
@@ -2057,7 +2050,6 @@ static const zend_function_entry spl_funcs_ParentIterator[] = {
 };
 
 #if HAVE_PCRE || HAVE_BUNDLED_PCRE
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_regex_it___construct, 0, 0, 2) 
        ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0)
        ZEND_ARG_INFO(0, regex)
@@ -2066,17 +2058,14 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_regex_it___construct, 0, 0, 2)
        ZEND_ARG_INFO(0, preg_flags)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_regex_it_set_mode, 0, 0, 1) 
        ZEND_ARG_INFO(0, mode)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_regex_it_set_flags, 0, 0, 1) 
        ZEND_ARG_INFO(0, flags)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_regex_it_set_preg_flags, 0, 0, 1) 
        ZEND_ARG_INFO(0, preg_flags)
 ZEND_END_ARG_INFO();
@@ -2093,7 +2082,6 @@ static const zend_function_entry spl_funcs_RegexIterator[] = {
        {NULL, NULL, NULL}
 };
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_rec_regex_it___construct, 0, 0, 2) 
        ZEND_ARG_OBJ_INFO(0, iterator, RecursiveIterator, 0)
        ZEND_ARG_INFO(0, regex)
@@ -2229,7 +2217,6 @@ SPL_METHOD(LimitIterator, getPosition)
        RETURN_LONG(intern->current.pos);
 } /* }}} */
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_seekable_it_seek, 0) 
        ZEND_ARG_INFO(0, position)
 ZEND_END_ARG_INFO();
@@ -2239,14 +2226,12 @@ static const zend_function_entry spl_funcs_SeekableIterator[] = {
        {NULL, NULL, NULL}
 };
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_limit_it___construct, 0, 0, 1) 
        ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0)
        ZEND_ARG_INFO(0, offset)
        ZEND_ARG_INFO(0, count)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_limit_it_seek, 0) 
        ZEND_ARG_INFO(0, position)
 ZEND_END_ARG_INFO();
@@ -2639,23 +2624,19 @@ SPL_METHOD(CachingIterator, count)
 }
 /* }}} */
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_caching_it___construct, 0, 0, 1) 
        ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0)
        ZEND_ARG_INFO(0, flags)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_caching_it_setFlags, 0) 
        ZEND_ARG_INFO(0, flags)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_caching_it_offsetGet, 0)
        ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_caching_it_offsetSet, 0)
        ZEND_ARG_INFO(0, index)
        ZEND_ARG_INFO(0, newval)
@@ -2715,7 +2696,6 @@ SPL_METHOD(RecursiveCachingIterator, getChildren)
        }
 } /* }}} */
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_caching_rec_it___construct, 0, ZEND_RETURN_VALUE, 1) 
        ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0)
        ZEND_ARG_INFO(0, flags)
@@ -2735,7 +2715,6 @@ SPL_METHOD(IteratorIterator, __construct)
        spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU, spl_ce_IteratorIterator, zend_ce_traversable, DIT_IteratorIterator);
 } /* }}} */
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_iterator_it___construct, 0) 
        ZEND_ARG_OBJ_INFO(0, iterator, Traversable, 0)
 ZEND_END_ARG_INFO();
@@ -2827,7 +2806,6 @@ SPL_METHOD(NoRewindIterator, next)
        intern->inner.iterator->funcs->move_forward(intern->inner.iterator TSRMLS_CC);
 } /* }}} */
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_norewind_it___construct, 0) 
        ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0)
 ZEND_END_ARG_INFO();
@@ -3060,7 +3038,6 @@ SPL_METHOD(AppendIterator, getArrayIterator)
        RETURN_ZVAL(intern->u.append.zarrayit, 1, 0);
 } /* }}} */
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_append_it_append, 0) 
        ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0)
 ZEND_END_ARG_INFO();

diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c
index 23b35d422c6d392fb1e89e9e5c9f9d330bdbd9dd..652be95d54a9b9460ce89f3baa94092854bf08e4 100755 (executable)
--- a/ext/spl/spl_observer.c
+++ b/ext/spl/spl_observer.c
@@ -43,7 +43,6 @@ SPL_METHOD(SplSubject, attach);
 SPL_METHOD(SplSubject, detach);
 SPL_METHOD(SplSubject, notify);
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_SplObserver_update, 0)
        ZEND_ARG_OBJ_INFO(0, SplSubject, SplSubject, 0)
 ZEND_END_ARG_INFO();
@@ -53,13 +52,11 @@ static const zend_function_entry spl_funcs_SplObserver[] = {
        {NULL, NULL, NULL}
 };
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_SplSubject_attach, 0)
        ZEND_ARG_OBJ_INFO(0, SplObserver, SplObserver, 0)
 ZEND_END_ARG_INFO();
 
-/*static
-ZEND_BEGIN_ARG_INFO_EX(arginfo_SplSubject_notify, 0, 0, 1)
+/*ZEND_BEGIN_ARG_INFO_EX(arginfo_SplSubject_notify, 0, 0, 1)
        ZEND_ARG_OBJ_INFO(0, ignore, SplObserver, 1)
 ZEND_END_ARG_INFO();*/
 
@@ -566,33 +563,27 @@ outexcept:
 
 } /* }}} */
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_Object, 0)
        ZEND_ARG_INFO(0, object)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_attach, 0, 0, 1)
        ZEND_ARG_INFO(0, object)
        ZEND_ARG_INFO(0, inf)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_Serialized, 0)
        ZEND_ARG_INFO(0, serialized)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_setInfo, 0)
        ZEND_ARG_INFO(0, info)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_offsetGet, 0, 0, 1)
        ZEND_ARG_INFO(0, object)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_offsetSet, 0, 0, 2)
        ZEND_ARG_INFO(0, object)
        ZEND_ARG_INFO(0, info)
@@ -854,18 +845,15 @@ SPL_METHOD(MultipleIterator, key)
 }
 /* }}} */
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_MultipleIterator_attachIterator, 0, 0, 1)
        ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0)
        ZEND_ARG_INFO(0, infos)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_MultipleIterator_detachIterator, 0, 0, 1)
        ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_MultipleIterator_containsIterator, 0, 0, 1)
        ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0)
 ZEND_END_ARG_INFO();

diff --git a/ext/sqlite/sqlite.c b/ext/sqlite/sqlite.c
index 884adc11a77221d18215ece8c73ccea8b8f87444..30707bf2aafeff7c330148c6b0825a5ab2f06558 100644 (file)
--- a/ext/sqlite/sqlite.c
+++ b/ext/sqlite/sqlite.c
@@ -211,44 +211,37 @@ static int php_sqlite_fetch(struct php_sqlite_result *rres TSRMLS_DC);
 enum { PHPSQLITE_ASSOC = 1, PHPSQLITE_NUM = 2, PHPSQLITE_BOTH = PHPSQLITE_ASSOC|PHPSQLITE_NUM };
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_popen, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, mode)
        ZEND_ARG_INFO(1, error_message)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_open, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, mode)
        ZEND_ARG_INFO(1, error_message)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_factory, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, mode)
        ZEND_ARG_INFO(1, error_message)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_busy_timeout, 0, 0, 2)
        ZEND_ARG_INFO(0, db)
        ZEND_ARG_INFO(0, ms)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_busy_timeout, 0, 0, 1)
        ZEND_ARG_INFO(0, ms)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_close, 0, 0, 1)
        ZEND_ARG_INFO(0, db)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_unbuffered_query, 0, 0, 2)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_INFO(0, db)
@@ -256,27 +249,23 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_unbuffered_query, 0, 0, 2)
        ZEND_ARG_INFO(1, error_message)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_unbuffered_query, 0, 0, 1)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_INFO(0, result_type)
        ZEND_ARG_INFO(1, error_message)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_fetch_column_types, 0, 0, 2)
        ZEND_ARG_INFO(0, table_name)
        ZEND_ARG_INFO(0, db)
        ZEND_ARG_INFO(0, result_type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_fetch_column_types, 0, 0, 1)
        ZEND_ARG_INFO(0, table_name)
        ZEND_ARG_INFO(0, result_type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_query, 0, 0, 2)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_INFO(0, db)
@@ -284,53 +273,45 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_query, 0, 0, 2)
        ZEND_ARG_INFO(1, error_message)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_query, 0, 0, 1)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_INFO(0, result_type)
        ZEND_ARG_INFO(1, error_message)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_exec, 0, 0, 2)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_INFO(0, db)
        ZEND_ARG_INFO(1, error_message)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_exec, 0, 0, 1)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_INFO(1, error_message)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_fetch_all, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, result_type)
        ZEND_ARG_INFO(0, decode_binary)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_fetch_all, 0, 0, 0)
        ZEND_ARG_INFO(0, result_type)
        ZEND_ARG_INFO(0, decode_binary)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_fetch_array, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, result_type)
        ZEND_ARG_INFO(0, decode_binary)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_fetch_array, 0, 0, 0)
        ZEND_ARG_INFO(0, result_type)
        ZEND_ARG_INFO(0, decode_binary)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_fetch_object, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, class_name)
@@ -338,14 +319,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_fetch_object, 0, 0, 1)
        ZEND_ARG_INFO(0, decode_binary)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_fetch_object, 0, 0, 0)
        ZEND_ARG_INFO(0, class_name)
        ZEND_ARG_INFO(0, ctor_params)
        ZEND_ARG_INFO(0, decode_binary)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_array_query, 0, 0, 2)
        ZEND_ARG_INFO(0, db)
        ZEND_ARG_INFO(0, query)
@@ -353,14 +332,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_array_query, 0, 0, 2)
        ZEND_ARG_INFO(0, decode_binary)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_array_query, 0, 0, 1)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_INFO(0, result_type)
        ZEND_ARG_INFO(0, decode_binary)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_single_query, 0, 0, 2)
        ZEND_ARG_INFO(0, db)
        ZEND_ARG_INFO(0, query)
@@ -368,190 +345,152 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_single_query, 0, 0, 2)
        ZEND_ARG_INFO(0, decode_binary)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_single_query, 0, 0, 1)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_INFO(0, first_row_only)
        ZEND_ARG_INFO(0, decode_binary)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_fetch_single, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, decode_binary)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_fetch_single, 0, 0, 0)
        ZEND_ARG_INFO(0, decode_binary)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_current, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, result_type)
        ZEND_ARG_INFO(0, decode_binary)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_current, 0, 0, 0)
        ZEND_ARG_INFO(0, result_type)
        ZEND_ARG_INFO(0, decode_binary)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_column, 0, 0, 2)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, index_or_name)
        ZEND_ARG_INFO(0, decode_binary)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_column, 0, 0, 1)
        ZEND_ARG_INFO(0, index_or_name)
        ZEND_ARG_INFO(0, decode_binary)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite_libversion, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite_libencoding, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_changes, 0, 0, 1)
        ZEND_ARG_INFO(0, db)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_changes, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_last_insert_rowid, 0, 0, 1)
        ZEND_ARG_INFO(0, db)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_last_insert_rowid, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_num_rows, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_num_rows, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_valid, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_valid, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_has_prev, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_has_prev, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_num_fields, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_num_fields, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_field_name, 0, 0, 2)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, field_index)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_field_name, 0, 0, 1)
        ZEND_ARG_INFO(0, field_index)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_seek, 0, 0, 2)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, row)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_seek, 0, 0, 1)
        ZEND_ARG_INFO(0, row)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_rewind, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_rewind, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_next, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_next, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_key, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_key, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_prev, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_prev, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_escape_string, 0, 0, 1)
        ZEND_ARG_INFO(0, item)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_last_error, 0, 0, 1)
        ZEND_ARG_INFO(0, db)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite_method_last_error, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_error_string, 0, 0, 1)
        ZEND_ARG_INFO(0, error_code)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_create_aggregate, 0, 0, 4)
        ZEND_ARG_INFO(0, db)
        ZEND_ARG_INFO(0, funcname)
@@ -560,7 +499,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_create_aggregate, 0, 0, 4)
        ZEND_ARG_INFO(0, num_args)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_create_aggregate, 0, 0, 3)
        ZEND_ARG_INFO(0, funcname)
        ZEND_ARG_INFO(0, step_func)
@@ -568,7 +506,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_create_aggregate, 0, 0, 3)
        ZEND_ARG_INFO(0, num_args)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_create_function, 0, 0, 3)
        ZEND_ARG_INFO(0, db)
        ZEND_ARG_INFO(0, funcname)
@@ -576,19 +513,16 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_create_function, 0, 0, 3)
        ZEND_ARG_INFO(0, num_args)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_method_create_function, 0, 0, 2)
        ZEND_ARG_INFO(0, funcname)
        ZEND_ARG_INFO(0, callback)
        ZEND_ARG_INFO(0, num_args)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_udf_encode_binary, 0, 0, 1)
        ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite_udf_decode_binary, 0, 0, 1)
        ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO()

diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c
index 3e8a24a5363377e201f724f660c93bb566716077..7392cbba0537ff87c28b2e50bd272ca6c898f876 100644 (file)
--- a/ext/sqlite3/sqlite3.c
+++ b/ext/sqlite3/sqlite3.c
@@ -1357,76 +1357,61 @@ PHP_METHOD(sqlite3result, finalize)
 /* }}} */
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_open, 0)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, flags)
        ZEND_ARG_INFO(0, encryption_key)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_close, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_exec, 0)
        ZEND_ARG_INFO(0, query)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_version, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_lastinsertrowid, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_lasterrorcode, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_lasterrormsg, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_loadextension, 0)
        ZEND_ARG_INFO(0, shared_library)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_changes, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3_escapestring, 0, 0, 1)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3_prepare, 0, 0, 1)
        ZEND_ARG_INFO(0, query)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3_query, 0, 0, 1)
        ZEND_ARG_INFO(0, query)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3_querysingle, 0, 0, 1)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_INFO(0, entire_row)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3_createfunction, 0, 0, 2)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, callback)
        ZEND_ARG_INFO(0, argument_count)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3_createaggregate, 0, 0, 3)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, step_callback)
@@ -1434,64 +1419,51 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3_createaggregate, 0, 0, 3)
        ZEND_ARG_INFO(0, argument_count)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite3stmt_paramcount, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite3stmt_close, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite3stmt_reset, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite3stmt_clear, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite3stmt_execute, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3stmt_bindparam, 0, 0, 2)
        ZEND_ARG_INFO(0, param_number)
        ZEND_ARG_INFO(1, param)
        ZEND_ARG_INFO(0, type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3stmt_bindvalue, 0, 0, 2)
        ZEND_ARG_INFO(0, param_number)
        ZEND_ARG_INFO(0, param)
        ZEND_ARG_INFO(0, type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite3result_numcolumns, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3result_columnname, 0, 0, 1)
        ZEND_ARG_INFO(0, column_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3result_columntype, 0, 0, 1)
        ZEND_ARG_INFO(0, column_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3result_fetcharray, 0, 0, 1)
        ZEND_ARG_INFO(0, mode)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite3result_reset, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqlite3result_finalize, 0)
 ZEND_END_ARG_INFO()
 /* }}} */

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 2f9f26eda82f8131656645dc6d72ae640a0c9848..3c948eac92e0445c49947eaf21a4481cf1e1d019 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -136,303 +136,249 @@ static void user_tick_function_dtor(user_tick_function_entry *tick_function_entr
 
 /* {{{ arginfo */
 /* {{{ main/main.c */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_set_time_limit, 0)
        ZEND_ARG_INFO(0, seconds)
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ main/output.c */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ob_start, 0, 0, 0)
        ZEND_ARG_INFO(0, user_function)
        ZEND_ARG_INFO(0, chunk_size)
        ZEND_ARG_INFO(0, flags)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ob_flush, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ob_clean, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ob_end_flush, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ob_end_clean, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ob_get_flush, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ob_get_clean, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ob_get_contents, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ob_get_level, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ob_get_length, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ob_list_handlers, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ob_get_status, 0, 0, 0)
        ZEND_ARG_INFO(0, full_status)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ob_implicit_flush, 0, 0, 0)
        ZEND_ARG_INFO(0, flag)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_output_reset_rewrite_vars, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_output_add_rewrite_var, 0)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ main/streams/userspace.c */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_wrapper_register, 0, 0, 2)
        ZEND_ARG_INFO(0, protocol)
        ZEND_ARG_INFO(0, classname)
        ZEND_ARG_INFO(0, flags)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_stream_wrapper_unregister, 0)
        ZEND_ARG_INFO(0, protocol)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_stream_wrapper_restore, 0)
        ZEND_ARG_INFO(0, protocol)
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ array.c */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_krsort, 0, 0, 1)
        ZEND_ARG_INFO(1, arg) /* ARRAY_INFO(1, arg, 0) */
        ZEND_ARG_INFO(0, sort_flags)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ksort, 0, 0, 1)
        ZEND_ARG_INFO(1, arg) /* ARRAY_INFO(1, arg, 0) */
        ZEND_ARG_INFO(0, sort_flags)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_count, 0, 0, 1)
        ZEND_ARG_INFO(0, var)
        ZEND_ARG_INFO(0, mode)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_natsort, 0)
        ZEND_ARG_INFO(1, arg) /* ARRAY_INFO(1, arg, 0) */
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_natcasesort, 0)
        ZEND_ARG_INFO(1, arg) /* ARRAY_INFO(1, arg, 0) */
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_asort, 0, 0, 1)
        ZEND_ARG_INFO(1, arg) /* ARRAY_INFO(1, arg, 0) */
        ZEND_ARG_INFO(0, sort_flags)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_arsort, 0, 0, 1)
        ZEND_ARG_INFO(1, arg) /* ARRAY_INFO(1, arg, 0) */
        ZEND_ARG_INFO(0, sort_flags)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sort, 0, 0, 1)
        ZEND_ARG_INFO(1, arg) /* ARRAY_INFO(1, arg, 0) */
        ZEND_ARG_INFO(0, sort_flags)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_rsort, 0, 0, 1)
        ZEND_ARG_INFO(1, arg) /* ARRAY_INFO(1, arg, 0) */
        ZEND_ARG_INFO(0, sort_flags)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_usort, 0)
        ZEND_ARG_INFO(1, arg) /* ARRAY_INFO(1, arg, 0) */
        ZEND_ARG_INFO(0, cmp_function)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_uasort, 0)
        ZEND_ARG_INFO(1, arg) /* ARRAY_INFO(1, arg, 0) */
        ZEND_ARG_INFO(0, cmp_function)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_uksort, 0)
        ZEND_ARG_INFO(1, arg) /* ARRAY_INFO(1, arg, 0) */
        ZEND_ARG_INFO(0, cmp_function)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_end, 0)
        ZEND_ARG_INFO(1, arg)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_prev, 0)
        ZEND_ARG_INFO(1, arg)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_next, 0)
        ZEND_ARG_INFO(1, arg)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_reset, 0)
        ZEND_ARG_INFO(1, arg)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_current, ZEND_SEND_PREFER_REF)
        ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, arg)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_key, ZEND_SEND_PREFER_REF)
        ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, arg)
 ZEND_END_ARG_INFO()
 
-static
 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_END_ARG_INFO()
 
-static
 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_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_array_walk, 0, 0, 2)
        ZEND_ARG_INFO(1, input) /* ARRAY_INFO(1, arg, 0) */
        ZEND_ARG_INFO(0, funcname)
        ZEND_ARG_INFO(0, userdata)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_array_walk_recursive, 0, 0, 2)
        ZEND_ARG_INFO(1, input) /* ARRAY_INFO(1, arg, 0) */
        ZEND_ARG_INFO(0, funcname)
        ZEND_ARG_INFO(0, userdata)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_in_array, 0, 0, 2)
        ZEND_ARG_INFO(0, needle)
        ZEND_ARG_INFO(0, haystack) /* ARRAY_INFO(0, haystack, 0) */
        ZEND_ARG_INFO(0, strict)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_array_search, 0, 0, 2)
        ZEND_ARG_INFO(0, needle)
        ZEND_ARG_INFO(0, haystack) /* ARRAY_INFO(0, haystack, 0) */
        ZEND_ARG_INFO(0, strict)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_extract, 0, 0, 1)
        ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */
        ZEND_ARG_INFO(0, extract_type)
        ZEND_ARG_INFO(0, prefix)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_compact, 0, 0, 1)
        ZEND_ARG_INFO(0, var_names)
        ZEND_ARG_INFO(0, ...)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array_fill, 0)
        ZEND_ARG_INFO(0, start_key)
        ZEND_ARG_INFO(0, num)
        ZEND_ARG_INFO(0, val)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array_fill_keys, 0)
        ZEND_ARG_INFO(0, keys) /* ARRAY_INFO(0, keys, 0) */
        ZEND_ARG_INFO(0, val)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_range, 0, 0, 2)
        ZEND_ARG_INFO(0, low)
        ZEND_ARG_INFO(0, high)
        ZEND_ARG_INFO(0, step)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_shuffle, 0)
        ZEND_ARG_INFO(1, arg) /* ARRAY_INFO(1, arg, 0) */
 ZEND_END_ARG_INFO()
 
-static
 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_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array_pop, 0)
        ZEND_ARG_INFO(1, stack) /* ARRAY_INFO(1, stack, 0) */
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array_shift, 0)
        ZEND_ARG_INFO(1, stack) /* ARRAY_INFO(1, stack, 0) */
 ZEND_END_ARG_INFO()
 
-static
 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_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_array_splice, 0, 0, 2)
        ZEND_ARG_INFO(1, arg) /* ARRAY_INFO(1, arg, 0) */
        ZEND_ARG_INFO(0, offset)
@@ -440,7 +386,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_array_splice, 0, 0, 2)
        ZEND_ARG_INFO(0, replacement) /* ARRAY_INFO(0, arg, 1) */
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_array_slice, 0, 0, 2)
        ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(1, arg, 0) */
        ZEND_ARG_INFO(0, offset)
@@ -448,130 +393,110 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_array_slice, 0, 0, 2)
        ZEND_ARG_INFO(0, preserve_keys)
 ZEND_END_ARG_INFO()
 
-static
 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_END_ARG_INFO()
 
-static
 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_END_ARG_INFO()
 
-static
 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_END_ARG_INFO()
 
-static
 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_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_array_keys, 0, 0, 1)
        ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */
        ZEND_ARG_INFO(0, search_value)
        ZEND_ARG_INFO(0, strict)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array_values, 0)
        ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array_count_values, 0)
        ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_array_reverse, 0, 0, 1)
        ZEND_ARG_INFO(0, input) /* ARRAY_INFO(0, arg, 0) */
        ZEND_ARG_INFO(0, preserve_keys)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array_pad, 0)
        ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */
        ZEND_ARG_INFO(0, pad_size)
        ZEND_ARG_INFO(0, pad_value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array_flip, 0)
        ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_array_change_key_case, 0, 0, 1)
        ZEND_ARG_INFO(0, input) /* ARRAY_INFO(0, arg, 0) */
        ZEND_ARG_INFO(0, case)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array_unique, 0)
        ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */
 ZEND_END_ARG_INFO()
 
-static
 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_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array_intersect_ukey, 0)
        ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg1, 0) */
        ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg2, 0) */
        ZEND_ARG_INFO(0, callback_key_compare_func)
 ZEND_END_ARG_INFO()
 
-static
 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_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array_uintersect, 0)
        ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg1, 0) */
        ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg2, 0) */
        ZEND_ARG_INFO(0, callback_data_compare_func)
 ZEND_END_ARG_INFO()
 
-static
 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_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array_uintersect_assoc, 0)
        ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg1, 0) */
        ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg2, 0) */
        ZEND_ARG_INFO(0, callback_data_compare_func)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array_intersect_uassoc, 0)
        ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg1, 0) */
        ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg2, 0) */
        ZEND_ARG_INFO(0, callback_key_compare_func)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array_uintersect_uassoc, 0)
        ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg1, 0) */
        ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg2, 0) */
@@ -579,56 +504,48 @@ ZEND_BEGIN_ARG_INFO(arginfo_array_uintersect_uassoc, 0)
        ZEND_ARG_INFO(0, callback_key_compare_func)
 ZEND_END_ARG_INFO()
 
-static
 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_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array_diff_ukey, 0)
        ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg1, 0) */
        ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg2, 0) */
        ZEND_ARG_INFO(0, callback_key_comp_func)
 ZEND_END_ARG_INFO()
 
-static
 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_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array_udiff, 0)
        ZEND_ARG_INFO(0, arr1)
        ZEND_ARG_INFO(0, arr2)
        ZEND_ARG_INFO(0, callback_data_comp_func)
 ZEND_END_ARG_INFO()
 
-static
 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_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array_diff_uassoc, 0)
        ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg1, 0) */
        ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg2, 0) */
        ZEND_ARG_INFO(0, callback_data_comp_func)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array_udiff_assoc, 0)
        ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg1, 0) */
        ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg2, 0) */
        ZEND_ARG_INFO(0, callback_key_comp_func)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array_udiff_uassoc, 0)
        ZEND_ARG_INFO(0, arr1) /* ARRAY_INFO(0, arg1, 0) */
        ZEND_ARG_INFO(0, arr2) /* ARRAY_INFO(0, arg2, 0) */
@@ -636,7 +553,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_array_udiff_uassoc, 0)
        ZEND_ARG_INFO(0, callback_key_comp_func)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_array_multisort, ZEND_SEND_PREFER_REF, 0, 1)
        ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, arr1) /* ARRAY_INFO(0, arg1, 0) */
        ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, SORT_ASC_or_SORT_DESC)
@@ -646,36 +562,30 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_array_multisort, ZEND_SEND_PREFER_REF, 0, 1)
        ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, SORT_REGULAR_or_SORT_NUMERIC_or_SORT_STRING)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_array_rand, 0, 0, 1)
        ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */
        ZEND_ARG_INFO(0, num_req)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array_sum, 0)
        ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array_product, 0)
        ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_array_reduce, 0, 0, 2)
        ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */
        ZEND_ARG_INFO(0, callback)
        ZEND_ARG_INFO(0, initial)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_array_filter, 0, 0, 1)
        ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */
        ZEND_ARG_INFO(0, callback)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_array_map, 0, 0, 3)
        ZEND_ARG_INFO(0, callback)
        ZEND_ARG_INFO(0, arg1) /* ARRAY_INFO(0, arg1, 0) */
@@ -683,118 +593,97 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_array_map, 0, 0, 3)
        ZEND_ARG_INFO(0, ...)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array_key_exists, 0)
        ZEND_ARG_INFO(0, key)
        ZEND_ARG_INFO(0, search)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_array_chunk, 0, 0, 2)
        ZEND_ARG_INFO(0, arg) /* ARRAY_INFO(0, arg, 0) */
        ZEND_ARG_INFO(0, size)
        ZEND_ARG_INFO(0, preserve_keys)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_array_combine, 0)
        ZEND_ARG_INFO(0, keys)   /* ARRAY_INFO(0, keys, 0) */
        ZEND_ARG_INFO(0, values) /* ARRAY_INFO(0, values, 0) */
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ basic_functions.c */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_constant, 0)
        ZEND_ARG_INFO(0, const_name)
 ZEND_END_ARG_INFO()
 
 #ifdef HAVE_INET_NTOP
-static
 ZEND_BEGIN_ARG_INFO(arginfo_inet_ntop, 0)
        ZEND_ARG_INFO(0, in_addr)
 ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_INET_PTON
-static
 ZEND_BEGIN_ARG_INFO(arginfo_inet_pton, 0)
        ZEND_ARG_INFO(0, ip_address)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ip2long, 0)
        ZEND_ARG_INFO(0, ip_address)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_long2ip, 0)
        ZEND_ARG_INFO(0, proper_address)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_getenv, 0)
        ZEND_ARG_INFO(0, varname)
 ZEND_END_ARG_INFO()
 
 #ifdef HAVE_PUTENV
-static
 ZEND_BEGIN_ARG_INFO(arginfo_putenv, 0)
        ZEND_ARG_INFO(0, setting)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_getopt, 0, 0, 1)
        ZEND_ARG_INFO(0, options)
        ZEND_ARG_INFO(0, opts) /* ARRAY_INFO(0, opts, 1) */
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_flush, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sleep, 0)
        ZEND_ARG_INFO(0, seconds)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_usleep, 0)
        ZEND_ARG_INFO(0, micro_seconds)
 ZEND_END_ARG_INFO()
 
 #if HAVE_NANOSLEEP
-static
 ZEND_BEGIN_ARG_INFO(arginfo_time_nanosleep, 0)
        ZEND_ARG_INFO(0, seconds)
        ZEND_ARG_INFO(0, nanoseconds)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_time_sleep_until, 0)
        ZEND_ARG_INFO(0, timestamp)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_get_current_user, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_get_cfg_var, 0)
        ZEND_ARG_INFO(0, option_name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_get_magic_quotes_gpc, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_get_magic_quotes_runtime, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_error_log, 0, 0, 1)
        ZEND_ARG_INFO(0, message)
        ZEND_ARG_INFO(0, message_type)
@@ -802,24 +691,20 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_error_log, 0, 0, 1)
        ZEND_ARG_INFO(0, extra_headers)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_error_get_last, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
-static
 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_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_call_user_func_array, 0, 0, 2)
        ZEND_ARG_INFO(0, function_name)
        ZEND_ARG_INFO(0, parameters) /* ARRAY_INFO(0, parameters, 1) */
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_call_user_method, 0, 0, 2)
        ZEND_ARG_INFO(0, method_name)
        ZEND_ARG_INFO(1, object)
@@ -827,103 +712,84 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_call_user_method, 0, 0, 2)
        ZEND_ARG_INFO(0, ...)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_call_user_method_array, 0)
        ZEND_ARG_INFO(0, method_name)
        ZEND_ARG_INFO(1, object)
        ZEND_ARG_INFO(0, params) /* ARRAY_INFO(0, params, 1) */
 ZEND_END_ARG_INFO()
 
-static
 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_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_forward_static_call_array, 0, 0, 2)
        ZEND_ARG_INFO(0, function_name)
        ZEND_ARG_INFO(0, parameters) /* ARRAY_INFO(0, parameters, 1) */
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_register_shutdown_function, 0)
        ZEND_ARG_INFO(0, function_name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_highlight_file, 0, 0, 1)
        ZEND_ARG_INFO(0, file_name)
        ZEND_ARG_INFO(0, return)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_php_strip_whitespace, 0)
        ZEND_ARG_INFO(0, file_name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_highlight_string, 0, 0, 1)
        ZEND_ARG_INFO(0, string)
        ZEND_ARG_INFO(0, return)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ini_get, 0)
        ZEND_ARG_INFO(0, varname)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ini_get_all, 0, 0, 0)
        ZEND_ARG_INFO(0, extension)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ini_set, 0)
        ZEND_ARG_INFO(0, varname)
        ZEND_ARG_INFO(0, newvalue)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ini_restore, 0)
        ZEND_ARG_INFO(0, varname)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_set_include_path, 0)
        ZEND_ARG_INFO(0, new_include_path)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_get_include_path, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_restore_include_path, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_print_r, 0, 0, 1)
        ZEND_ARG_INFO(0, var)
        ZEND_ARG_INFO(0, return)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_connection_aborted, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_connection_status, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ignore_user_abort, 0, 0, 0)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
 #if HAVE_GETSERVBYNAME
-static
 ZEND_BEGIN_ARG_INFO(arginfo_getservbyname, 0)
        ZEND_ARG_INFO(0, service)
        ZEND_ARG_INFO(0, protocol)
@@ -931,7 +797,6 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if HAVE_GETSERVBYPORT
-static
 ZEND_BEGIN_ARG_INFO(arginfo_getservbyport, 0)
        ZEND_ARG_INFO(0, port)
        ZEND_ARG_INFO(0, protocol)
@@ -939,43 +804,36 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if HAVE_GETPROTOBYNAME
-static
 ZEND_BEGIN_ARG_INFO(arginfo_getprotobyname, 0)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
 #endif
 
 #if HAVE_GETPROTOBYNUMBER
-static
 ZEND_BEGIN_ARG_INFO(arginfo_getprotobynumber, 0)
        ZEND_ARG_INFO(0, proto)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 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_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_unregister_tick_function, 0)
        ZEND_ARG_INFO(0, function_name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_is_uploaded_file, 0)
        ZEND_ARG_INFO(0, path)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_move_uploaded_file, 0)
        ZEND_ARG_INFO(0, path)
        ZEND_ARG_INFO(0, new_path)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_parse_ini_file, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, process_sections)
@@ -983,42 +841,35 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_parse_ini_file, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 #if ZEND_DEBUG
-static
 ZEND_BEGIN_ARG_INFO(arginfo_config_get_hash, 0)
 ZEND_END_ARG_INFO()
 #endif
  
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_import_request_variables, 0, 0, 1)
        ZEND_ARG_INFO(0, types)
        ZEND_ARG_INFO(0, prefix)
 ZEND_END_ARG_INFO()
 
 #ifdef HAVE_GETLOADAVG
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sys_getloadavg, 0)
 ZEND_END_ARG_INFO()
 #endif
 /* }}} */
 /* {{{ assert.c */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_assert, 0)
        ZEND_ARG_INFO(0, assertion)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_assert_options, 0, 0, 1)
        ZEND_ARG_INFO(0, what)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ base64.c */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_base64_encode, 0)
        ZEND_ARG_INFO(0, str)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_base64_decode, 0, 0, 1)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, strict)
@@ -1026,14 +877,12 @@ ZEND_END_ARG_INFO()
 
 /* }}} */
 /* {{{ browscap.c */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_get_browser, 0, 0, 0)
        ZEND_ARG_INFO(0, browser_name)
        ZEND_ARG_INFO(0, return_array)
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ crc32.c */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_crc32, 0)
        ZEND_ARG_INFO(0, str)
 ZEND_END_ARG_INFO()
@@ -1041,7 +890,6 @@ ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ crypt.c */
 #if HAVE_CRYPT
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_crypt, 0, 0, 1)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, salt)
@@ -1049,7 +897,6 @@ ZEND_END_ARG_INFO()
 #endif
 /* }}} */
 /* {{{ cyr_convert.c */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_convert_cyr_string, 0)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, from)
@@ -1059,7 +906,6 @@ ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ datetime.c */
 #if HAVE_STRPTIME
-static
 ZEND_BEGIN_ARG_INFO(arginfo_strptime, 0)
        ZEND_ARG_INFO(0, timestamp)
        ZEND_ARG_INFO(0, format)
@@ -1067,58 +913,48 @@ ZEND_END_ARG_INFO()
 #endif
 /* }}} */
 /* {{{ dir.c */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_opendir, 0, 0, 1)
        ZEND_ARG_INFO(0, path)
        ZEND_ARG_INFO(0, context)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dir, 0, 0, 1)
        ZEND_ARG_INFO(0, directory)
        ZEND_ARG_INFO(0, context)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_closedir, 0, 0, 0)
        ZEND_ARG_INFO(0, dir_handle)
 ZEND_END_ARG_INFO()
 
 #if defined(HAVE_CHROOT) && !defined(ZTS) && ENABLE_CHROOT_FUNC
-static
 ZEND_BEGIN_ARG_INFO(arginfo_chroot, 0)
        ZEND_ARG_INFO(0, directory)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_chdir, 0)
        ZEND_ARG_INFO(0, directory)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_getcwd, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_rewinddir, 0, 0, 0)
        ZEND_ARG_INFO(0, dir_handle)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_readdir, 0, 0, 0)
        ZEND_ARG_INFO(0, dir_handle)
 ZEND_END_ARG_INFO()
 
 #ifdef HAVE_GLOB
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_glob, 0, 0, 1)
        ZEND_ARG_INFO(0, pattern)
        ZEND_ARG_INFO(0, flags)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_scandir, 0, 0, 1)
        ZEND_ARG_INFO(0, dir)
        ZEND_ARG_INFO(0, sorting_order)
@@ -1126,30 +962,25 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_scandir, 0, 0, 1)
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ dns.c */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gethostbyaddr, 0)
        ZEND_ARG_INFO(0, ip_address)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gethostbyname, 0)
        ZEND_ARG_INFO(0, hostname)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gethostbynamel, 0)
        ZEND_ARG_INFO(0, hostname)
 ZEND_END_ARG_INFO()
 
 #if HAVE_RES_SEARCH && !(defined(__BEOS__)||defined(PHP_WIN32) || defined(NETWARE))
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dns_check_record, 0, 0, 1)
        ZEND_ARG_INFO(0, host)
        ZEND_ARG_INFO(0, type)
 ZEND_END_ARG_INFO()
 
 # if HAVE_DNS_FUNCS
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dns_get_record, 1, 0, 1)
        ZEND_ARG_INFO(0, hostname)
        ZEND_ARG_INFO(0, type)
@@ -1159,7 +990,6 @@ ZEND_END_ARG_INFO()
 # endif
 
 # if HAVE_DN_SKIPNAME && HAVE_DN_EXPAND
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dns_get_mx, 0, 0, 2)
        ZEND_ARG_INFO(0, hostname)
        ZEND_ARG_INFO(1, mxhosts) /* ARRAY_INFO(1, mxhosts, 1) */
@@ -1169,62 +999,52 @@ ZEND_END_ARG_INFO()
 #endif /* HAVE_RES_SEARCH && !(defined(__BEOS__)||defined(PHP_WIN32) || defined(NETWARE)) */
 /* }}} */
 /* {{{ exec.c */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_exec, 0, 0, 1)
        ZEND_ARG_INFO(0, command)
        ZEND_ARG_INFO(1, output) /* ARRAY_INFO(1, output, 1) */
        ZEND_ARG_INFO(1, return_value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_system, 0, 0, 1)
        ZEND_ARG_INFO(0, command)
        ZEND_ARG_INFO(1, return_value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_passthru, 0, 0, 1)
        ZEND_ARG_INFO(0, command)
        ZEND_ARG_INFO(1, return_value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_escapeshellcmd, 0)
        ZEND_ARG_INFO(0, command)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_escapeshellarg, 0)
        ZEND_ARG_INFO(0, arg)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_shell_exec, 0)
        ZEND_ARG_INFO(0, cmd)
 ZEND_END_ARG_INFO()
 
 #ifdef HAVE_NICE
-static
 ZEND_BEGIN_ARG_INFO(arginfo_proc_nice, 0)
        ZEND_ARG_INFO(0, priority)
 ZEND_END_ARG_INFO()
 #endif
 /* }}} */
 /* {{{ file.c */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_flock, 0, 0, 2)
        ZEND_ARG_INFO(0, fp)
        ZEND_ARG_INFO(0, operation)
        ZEND_ARG_INFO(1, wouldblock)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_get_meta_tags, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, use_include_path)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_file_get_contents, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, flags)
@@ -1233,7 +1053,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_file_get_contents, 0, 0, 1)
        ZEND_ARG_INFO(0, maxlen)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_file_put_contents, 0, 0, 2)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, data)
@@ -1241,24 +1060,20 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_file_put_contents, 0, 0, 2)
        ZEND_ARG_INFO(0, context)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_file, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, flags)
        ZEND_ARG_INFO(0, context)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_tempnam, 0)
        ZEND_ARG_INFO(0, dir)
        ZEND_ARG_INFO(0, prefix)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_tmpfile, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fopen, 0, 0, 2)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, mode)
@@ -1266,82 +1081,68 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_fopen, 0, 0, 2)
        ZEND_ARG_INFO(0, context)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_fclose, 0)
        ZEND_ARG_INFO(0, fp)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_popen, 0)
        ZEND_ARG_INFO(0, command)
        ZEND_ARG_INFO(0, mode)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_pclose, 0)
        ZEND_ARG_INFO(0, fp)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_feof, 0)
        ZEND_ARG_INFO(0, fp)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fgets, 0, 0, 1)
        ZEND_ARG_INFO(0, fp)
        ZEND_ARG_INFO(0, length)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_fgetc, 0)
        ZEND_ARG_INFO(0, fp)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fgetss, 0, 0, 1)
        ZEND_ARG_INFO(0, fp)
        ZEND_ARG_INFO(0, length)
        ZEND_ARG_INFO(0, allowable_tags)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fscanf, 1, 0, 2)
        ZEND_ARG_INFO(0, stream)
        ZEND_ARG_INFO(0, format)
        ZEND_ARG_INFO(1, ...)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fwrite, 0, 0, 2)
        ZEND_ARG_INFO(0, fp)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, length)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_fflush, 0)
        ZEND_ARG_INFO(0, fp)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_rewind, 0)
        ZEND_ARG_INFO(0, fp)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ftell, 0)
        ZEND_ARG_INFO(0, fp)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fseek, 0, 0, 2)
        ZEND_ARG_INFO(0, fp)
        ZEND_ARG_INFO(0, offset)
        ZEND_ARG_INFO(0, whence)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mkdir, 0, 0, 1)
        ZEND_ARG_INFO(0, pathname)
        ZEND_ARG_INFO(0, mode)
@@ -1349,65 +1150,54 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mkdir, 0, 0, 1)
        ZEND_ARG_INFO(0, context)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_rmdir, 0, 0, 1)
        ZEND_ARG_INFO(0, dirname)
        ZEND_ARG_INFO(0, context)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_readfile, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, flags)
        ZEND_ARG_INFO(0, context)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_umask, 0, 0, 0)
        ZEND_ARG_INFO(0, mask)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_fpassthru, 0)
        ZEND_ARG_INFO(0, fp)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_rename, 0, 0, 2)
        ZEND_ARG_INFO(0, old_name)
        ZEND_ARG_INFO(0, new_name)
        ZEND_ARG_INFO(0, context)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_unlink, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, context)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ftruncate, 0)
        ZEND_ARG_INFO(0, fp)
        ZEND_ARG_INFO(0, size)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_fstat, 0)
        ZEND_ARG_INFO(0, fp)
 ZEND_END_ARG_INFO()
-static
 ZEND_BEGIN_ARG_INFO(arginfo_copy, 0)
        ZEND_ARG_INFO(0, source_file)
        ZEND_ARG_INFO(0, destination_file)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_fread, 0)
        ZEND_ARG_INFO(0, fp)
        ZEND_ARG_INFO(0, length)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fputcsv, 0, 0, 2)
        ZEND_ARG_INFO(0, fp)
        ZEND_ARG_INFO(0, fields) /* ARRAY_INFO(0, fields, 1) */
@@ -1415,7 +1205,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_fputcsv, 0, 0, 2)
        ZEND_ARG_INFO(0, enclosure)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fgetcsv, 0, 0, 1)
        ZEND_ARG_INFO(0, fp)
        ZEND_ARG_INFO(0, length)
@@ -1424,14 +1213,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_fgetcsv, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 #if (!defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS)
-static
 ZEND_BEGIN_ARG_INFO(arginfo_realpath, 0)
        ZEND_ARG_INFO(0, path)
 ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_FNMATCH
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fnmatch, 0, 0, 2)
        ZEND_ARG_INFO(0, pattern)
        ZEND_ARG_INFO(0, filename)
@@ -1439,29 +1226,24 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_fnmatch, 0, 0, 2)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sys_get_temp_dir, 0)
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ filestat.c */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_disk_total_space, 0)
        ZEND_ARG_INFO(0, path)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_disk_free_space, 0)
        ZEND_ARG_INFO(0, path)
 ZEND_END_ARG_INFO()
 
 #ifndef NETWARE
-static
 ZEND_BEGIN_ARG_INFO(arginfo_chgrp, 0)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, group)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_chown, 0)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, user)
@@ -1469,27 +1251,23 @@ ZEND_END_ARG_INFO()
 #endif
 
 #if HAVE_LCHOWN
-static
 ZEND_BEGIN_ARG_INFO(arginfo_lchgrp, 0)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, group)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_lchown, 0)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, user)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_chmod, 0)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, mode)
 ZEND_END_ARG_INFO()
 
 #if HAVE_UTIME
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_touch, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, time)
@@ -1497,130 +1275,106 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_touch, 0, 0, 1)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_clearstatcache, 0, 0, 0)
        ZEND_ARG_INFO(0, clear_realpath_cache)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_fileperms, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_fileinode, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_filesize, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_fileowner, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_filegroup, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_fileatime, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_filemtime, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_filectime, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_filetype, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_is_writable, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_is_readable, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_is_executable, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_is_file, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_is_dir, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_is_link, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_file_exists, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_lstat, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_stat, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ formatted_print.c */
-static
 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_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_vsprintf, 0)
        ZEND_ARG_INFO(0, format)
        ZEND_ARG_INFO(0, args) /* ARRAY_INFO(0, args, 1) */
 ZEND_END_ARG_INFO()
 
-static
 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_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_vprintf, 0)
        ZEND_ARG_INFO(0, format)
        ZEND_ARG_INFO(0, args) /* ARRAY_INFO(0, args, 1) */
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fprintf, 0, 0, 2)
        ZEND_ARG_INFO(0, stream)
        ZEND_ARG_INFO(0, format)
@@ -1628,7 +1382,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_fprintf, 0, 0, 2)
        ZEND_ARG_INFO(0, ...)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_vfprintf, 0)
        ZEND_ARG_INFO(0, stream)
        ZEND_ARG_INFO(0, format)
@@ -1636,7 +1389,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_vfprintf, 0)
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ fsock.c */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_fsockopen, 0, 0, 2)
        ZEND_ARG_INFO(0, hostname)
        ZEND_ARG_INFO(0, port)
@@ -1645,7 +1397,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_fsockopen, 0, 0, 2)
        ZEND_ARG_INFO(0, timeout)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pfsockopen, 0, 0, 2)
        ZEND_ARG_INFO(0, hostname)
        ZEND_ARG_INFO(0, port)
@@ -1656,7 +1407,6 @@ ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ ftok.c */
 #if HAVE_FTOK
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ftok, 0)
        ZEND_ARG_INFO(0, pathname)
        ZEND_ARG_INFO(0, proj)
@@ -1664,14 +1414,12 @@ ZEND_END_ARG_INFO()
 #endif
 /* }}} */
 /* {{{ head.c */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_header, 0, 0, 1)
        ZEND_ARG_INFO(0, header)
        ZEND_ARG_INFO(0, replace)
        ZEND_ARG_INFO(0, http_response_code)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_setcookie, 0, 0, 1)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, value)
@@ -1681,7 +1429,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_setcookie, 0, 0, 1)
        ZEND_ARG_INFO(0, secure)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_setrawcookie, 0, 0, 1)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, value)
@@ -1691,45 +1438,38 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_setrawcookie, 0, 0, 1)
        ZEND_ARG_INFO(0, secure)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_headers_sent, 0, 0, 0)
        ZEND_ARG_INFO(1, file)
        ZEND_ARG_INFO(1, line)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_headers_list, 0)
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ html.c */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_htmlspecialchars, 0, 0, 1)
        ZEND_ARG_INFO(0, string)
        ZEND_ARG_INFO(0, quote_style)
        ZEND_ARG_INFO(0, charset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_htmlspecialchars_decode, 0, 0, 1)
        ZEND_ARG_INFO(0, string)
        ZEND_ARG_INFO(0, quote_style)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_html_entity_decode, 0, 0, 1)
        ZEND_ARG_INFO(0, string)
        ZEND_ARG_INFO(0, quote_style)
        ZEND_ARG_INFO(0, charset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_htmlentities, 0, 0, 1)
        ZEND_ARG_INFO(0, string)
        ZEND_ARG_INFO(0, quote_style)
        ZEND_ARG_INFO(0, charset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_get_html_translation_table, 0, 0, 0)
        ZEND_ARG_INFO(0, table)
        ZEND_ARG_INFO(0, quote_style)
@@ -1737,7 +1477,6 @@ ZEND_END_ARG_INFO()
 
 /* }}} */
 /* {{{ http.c */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_http_build_query, 0, 0, 1)
        ZEND_ARG_INFO(0, formdata)
        ZEND_ARG_INFO(0, prefix)
@@ -1745,91 +1484,73 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_http_build_query, 0, 0, 1)
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ image.c */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_image_type_to_mime_type, 0)
        ZEND_ARG_INFO(0, imagetype)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_image_type_to_extension, 0, 0, 1)
        ZEND_ARG_INFO(0, imagetype)
        ZEND_ARG_INFO(0, include_dot)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_getimagesize, 0, 0, 1)
        ZEND_ARG_INFO(0, imagefile)
        ZEND_ARG_INFO(1, info) /* ARRAY_INFO(1, info, 1) */
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ info.c */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phpinfo, 0, 0, 0)
        ZEND_ARG_INFO(0, what)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phpversion, 0, 0, 0)
        ZEND_ARG_INFO(0, extension)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phpcredits, 0, 0, 0)
        ZEND_ARG_INFO(0, flag)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_php_logo_guid, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_php_real_logo_guid, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_php_egg_logo_guid, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_zend_logo_guid, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_php_sapi_name, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_php_uname, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_php_ini_scanned_files, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_php_ini_loaded_file, 0)
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ iptc.c */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_iptcembed, 0, 0, 2)
        ZEND_ARG_INFO(0, iptcdata)
        ZEND_ARG_INFO(0, jpeg_file_name)
        ZEND_ARG_INFO(0, spool)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_iptcparse, 0)
        ZEND_ARG_INFO(0, iptcdata)
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ lcg.c */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_lcg_value, 0)
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ levenshtein.c */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_levenshtein, 0)
        ZEND_ARG_INFO(0, str1)
        ZEND_ARG_INFO(0, str2)
@@ -1840,23 +1561,19 @@ ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ link.c */
 #ifdef HAVE_SYMLINK
-static
 ZEND_BEGIN_ARG_INFO(arginfo_readlink, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_linkinfo, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_symlink, 0)
        ZEND_ARG_INFO(0, target)
        ZEND_ARG_INFO(0, link)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_link, 0)
        ZEND_ARG_INFO(0, target)
        ZEND_ARG_INFO(0, link)
@@ -1864,12 +1581,10 @@ ZEND_END_ARG_INFO()
 #endif
 /* }}} */
 /* {{{ mail.c */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ezmlm_hash, 0)
        ZEND_ARG_INFO(0, addr)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mail, 0, 0, 3)
        ZEND_ARG_INFO(0, to)
        ZEND_ARG_INFO(0, subject)
@@ -1879,203 +1594,164 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mail, 0, 0, 3)
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ math.c */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_abs, 0)
        ZEND_ARG_INFO(0, number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ceil, 0)
        ZEND_ARG_INFO(0, number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_floor, 0)
        ZEND_ARG_INFO(0, number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_round, 0, 0, 1)
        ZEND_ARG_INFO(0, number)
        ZEND_ARG_INFO(0, precision)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sin, 0)
        ZEND_ARG_INFO(0, number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_cos, 0)
        ZEND_ARG_INFO(0, number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_tan, 0)
        ZEND_ARG_INFO(0, number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_asin, 0)
        ZEND_ARG_INFO(0, number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_acos, 0)
        ZEND_ARG_INFO(0, number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_atan, 0)
        ZEND_ARG_INFO(0, number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_atan2, 0)
        ZEND_ARG_INFO(0, y)
        ZEND_ARG_INFO(0, x)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sinh, 0)
        ZEND_ARG_INFO(0, number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_cosh, 0)
        ZEND_ARG_INFO(0, number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_tanh, 0)
        ZEND_ARG_INFO(0, number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_asinh, 0)
        ZEND_ARG_INFO(0, number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_acosh, 0)
        ZEND_ARG_INFO(0, number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_atanh, 0)
        ZEND_ARG_INFO(0, number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_pi, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_is_finite, 0)
        ZEND_ARG_INFO(0, val)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_is_infinite, 0)
        ZEND_ARG_INFO(0, val)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_is_nan, 0)
        ZEND_ARG_INFO(0, val)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_pow, 0)
        ZEND_ARG_INFO(0, base)
        ZEND_ARG_INFO(0, exponent)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_exp, 0)
        ZEND_ARG_INFO(0, number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_expm1, 0)
        ZEND_ARG_INFO(0, number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_log1p, 0)
        ZEND_ARG_INFO(0, number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_log, 0, 0, 1)
        ZEND_ARG_INFO(0, number)
        ZEND_ARG_INFO(0, base)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_log10, 0)
        ZEND_ARG_INFO(0, number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_sqrt, 0)
        ZEND_ARG_INFO(0, number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_hypot, 0)
        ZEND_ARG_INFO(0, num1)
        ZEND_ARG_INFO(0, num2)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_deg2rad, 0)
        ZEND_ARG_INFO(0, number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_rad2deg, 0)
        ZEND_ARG_INFO(0, number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_bindec, 0)
        ZEND_ARG_INFO(0, binary_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_hexdec, 0)
        ZEND_ARG_INFO(0, hexadecimal_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_octdec, 0)
        ZEND_ARG_INFO(0, octal_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_decbin, 0)
        ZEND_ARG_INFO(0, decimal_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_decoct, 0)
        ZEND_ARG_INFO(0, decimal_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dechex, 0)
        ZEND_ARG_INFO(0, decimal_number)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_base_convert, 0)
        ZEND_ARG_INFO(0, number)
        ZEND_ARG_INFO(0, frombase)
        ZEND_ARG_INFO(0, tobase)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_number_format, 0, 0, 1)
        ZEND_ARG_INFO(0, number)
        ZEND_ARG_INFO(0, num_decimal_places)
@@ -2083,27 +1759,23 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_number_format, 0, 0, 1)
        ZEND_ARG_INFO(0, thousands_seperator)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_fmod, 0)
        ZEND_ARG_INFO(0, x)
        ZEND_ARG_INFO(0, y)
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ md5.c */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_md5, 0, 0, 1)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, raw_output)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_md5_file, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, raw_output)
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ metaphone.c */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_metaphone, 0, 0, 1)
        ZEND_ARG_INFO(0, text)
        ZEND_ARG_INFO(0, phones)
@@ -2111,78 +1783,64 @@ ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ microtime.c */
 #ifdef HAVE_GETTIMEOFDAY
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_microtime, 0, 0, 0)
        ZEND_ARG_INFO(0, get_as_float)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_gettimeofday, 0, 0, 0)
        ZEND_ARG_INFO(0, get_as_float)
 ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_GETRUSAGE
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_getrusage, 0, 0, 0)
        ZEND_ARG_INFO(0, who)
 ZEND_END_ARG_INFO()
 #endif
 /* }}} */
 /* {{{ pack.c */
-static
 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_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_unpack, 0)
        ZEND_ARG_INFO(0, format)
        ZEND_ARG_INFO(0, input)
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ pageinfo.c */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_getmyuid, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_getmygid, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_getmypid, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_getmyinode, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_getlastmod, 0)
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ proc_open.c */
 #ifdef PHP_CAN_SUPPORT_PROC_OPEN
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_proc_terminate, 0, 0, 1)
        ZEND_ARG_INFO(0, process)
        ZEND_ARG_INFO(0, signal)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_proc_close, 0)
        ZEND_ARG_INFO(0, process)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_proc_get_status, 0)
        ZEND_ARG_INFO(0, process)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_proc_open, 0, 0, 3)
        ZEND_ARG_INFO(0, command)
        ZEND_ARG_INFO(0, descriptorspec) /* ARRAY_INFO(0, descriptorspec, 1) */
@@ -2194,70 +1852,58 @@ ZEND_END_ARG_INFO()
 #endif
 /* }}} */
 /* {{{ quot_print.c */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_quoted_printable_decode, 0)
        ZEND_ARG_INFO(0, str)
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ quot_print.c */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_quoted_printable_encode, 0)
        ZEND_ARG_INFO(0, str)
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ rand.c */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_srand, 0, 0, 0)
        ZEND_ARG_INFO(0, seed)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mt_srand, 0, 0, 0)
        ZEND_ARG_INFO(0, seed)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_rand, 0, 0, 0)
        ZEND_ARG_INFO(0, min)
        ZEND_ARG_INFO(0, max)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mt_rand, 0, 0, 0)
        ZEND_ARG_INFO(0, min)
        ZEND_ARG_INFO(0, max)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_getrandmax, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_mt_getrandmax, 0)
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ sha1.c */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sha1, 0, 0, 1)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, raw_output)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sha1_file, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, raw_output)
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ soundex.c */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_soundex, 0)
        ZEND_ARG_INFO(0, str)
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ streamsfuncs.c */
 #if HAVE_SOCKETPAIR
-static
 ZEND_BEGIN_ARG_INFO(arginfo_stream_socket_pair, 0)
        ZEND_ARG_INFO(0, domain)
        ZEND_ARG_INFO(0, type)
@@ -2265,7 +1911,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_stream_socket_pair, 0)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_socket_client, 0, 0, 1)
        ZEND_ARG_INFO(0, remoteaddress)
        ZEND_ARG_INFO(1, errcode)
@@ -2275,7 +1920,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_socket_client, 0, 0, 1)
        ZEND_ARG_INFO(0, context)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_socket_server, 0, 0, 1)
        ZEND_ARG_INFO(0, localaddress)
        ZEND_ARG_INFO(1, errcode)
@@ -2284,20 +1928,17 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_socket_server, 0, 0, 1)
        ZEND_ARG_INFO(0, context)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_socket_accept, 0, 0, 1)
        ZEND_ARG_INFO(0, serverstream)
        ZEND_ARG_INFO(0, timeout)
        ZEND_ARG_INFO(1, peername)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_stream_socket_get_name, 0)
        ZEND_ARG_INFO(0, stream)
        ZEND_ARG_INFO(0, want_peer)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_socket_sendto, 0, 0, 2)
        ZEND_ARG_INFO(0, stream)
        ZEND_ARG_INFO(0, data)
@@ -2305,7 +1946,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_socket_sendto, 0, 0, 2)
        ZEND_ARG_INFO(0, target_addr)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_socket_recvfrom, 0, 0, 2)
        ZEND_ARG_INFO(0, stream)
        ZEND_ARG_INFO(0, amount)
@@ -2313,14 +1953,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_socket_recvfrom, 0, 0, 2)
        ZEND_ARG_INFO(1, remote_addr)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_get_contents, 0, 0, 1)
        ZEND_ARG_INFO(0, source)
        ZEND_ARG_INFO(0, maxlen)
        ZEND_ARG_INFO(0, offset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_copy_to_stream, 0, 0, 2)
        ZEND_ARG_INFO(0, source)
        ZEND_ARG_INFO(0, dest)
@@ -2328,30 +1966,24 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_copy_to_stream, 0, 0, 2)
        ZEND_ARG_INFO(0, pos)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_stream_get_meta_data, 0)
        ZEND_ARG_INFO(0, fp)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_stream_get_transports, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_stream_get_wrappers, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_stream_is_local, 0)
        ZEND_ARG_INFO(0, stream)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_supports_lock, 0, 0, 1)
        ZEND_ARG_INFO(0, stream)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_select, 0, 0, 4)
        ZEND_ARG_INFO(1, read_streams) /* ARRAY_INFO(1, read_streams, 1) */
        ZEND_ARG_INFO(1, write_streams) /* ARRAY_INFO(1, write_streams, 1) */
@@ -2360,12 +1992,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_select, 0, 0, 4)
        ZEND_ARG_INFO(0, tv_usec)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_stream_context_get_options, 0)
        ZEND_ARG_INFO(0, stream_or_context)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_stream_context_set_option, 0)
        ZEND_ARG_INFO(0, stream_or_context)
        ZEND_ARG_INFO(0, wrappername)
@@ -2373,29 +2003,24 @@ ZEND_BEGIN_ARG_INFO(arginfo_stream_context_set_option, 0)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_stream_context_set_params, 0)
        ZEND_ARG_INFO(0, stream_or_context)
        ZEND_ARG_INFO(0, options) /* ARRAY_INFO(0, options, 1) */
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_context_get_default, 0, 0, 0)
        ZEND_ARG_INFO(0, options) /* ARRAY_INFO(0, options, 1) */
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_stream_context_set_default, 0)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_context_create, 0, 0, 0)
        ZEND_ARG_INFO(0, options) /* ARRAY_INFO(0, options, 1) */
        ZEND_ARG_INFO(0, params) /* ARRAY_INFO(0, params, 1) */
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_filter_prepend, 0, 0, 2)
        ZEND_ARG_INFO(0, stream)
        ZEND_ARG_INFO(0, filtername)
@@ -2403,7 +2028,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_filter_prepend, 0, 0, 2)
        ZEND_ARG_INFO(0, filterparams)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_filter_append, 0, 0, 2)
        ZEND_ARG_INFO(0, stream)
        ZEND_ARG_INFO(0, filtername)
@@ -2411,26 +2035,22 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_filter_append, 0, 0, 2)
        ZEND_ARG_INFO(0, filterparams)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_stream_filter_remove, 0)
        ZEND_ARG_INFO(0, stream_filter)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_get_line, 0, 0, 2)
        ZEND_ARG_INFO(0, stream)
        ZEND_ARG_INFO(0, maxlen)
        ZEND_ARG_INFO(0, ending)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_stream_set_blocking, 0)
        ZEND_ARG_INFO(0, socket)
        ZEND_ARG_INFO(0, mode)
 ZEND_END_ARG_INFO()
 
 #if HAVE_SYS_TIME_H || defined(PHP_WIN32)
-static
 ZEND_BEGIN_ARG_INFO(arginfo_stream_set_timeout, 0)
        ZEND_ARG_INFO(0, stream)
        ZEND_ARG_INFO(0, seconds)
@@ -2438,13 +2058,11 @@ ZEND_BEGIN_ARG_INFO(arginfo_stream_set_timeout, 0)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_stream_set_write_buffer, 0)
        ZEND_ARG_INFO(0, fp)
        ZEND_ARG_INFO(0, buffer)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_socket_enable_crypto, 0, 0, 2)
        ZEND_ARG_INFO(0, stream)
        ZEND_ARG_INFO(0, enable)
@@ -2452,20 +2070,17 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_socket_enable_crypto, 0, 0, 2)
        ZEND_ARG_INFO(0, sessionstream)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_encoding, 0, 0, 1)
        ZEND_ARG_INFO(0, stream)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_resolve_include_path, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, context)
 ZEND_END_ARG_INFO()
 
 #ifdef HAVE_SHUTDOWN
-static
 ZEND_BEGIN_ARG_INFO(arginfo_stream_socket_shutdown, 0)
        ZEND_ARG_INFO(0, stream)
        ZEND_ARG_INFO(0, how)
@@ -2473,12 +2088,10 @@ ZEND_END_ARG_INFO()
 #endif
 /* }}} */
 /* {{{ string.c */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_bin2hex, 0)
        ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_strspn, 0, 0, 2)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, mask)
@@ -2486,7 +2099,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_strspn, 0, 0, 2)
        ZEND_ARG_INFO(0, len)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_strcspn, 0, 0, 2)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, mask)
@@ -2495,39 +2107,33 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_strcspn, 0, 0, 2)
 ZEND_END_ARG_INFO()
 
 #if HAVE_NL_LANGINFO
-static
 ZEND_BEGIN_ARG_INFO(arginfo_nl_langinfo, 0)
        ZEND_ARG_INFO(0, item)
 ZEND_END_ARG_INFO()
 #endif
 
 #ifdef HAVE_STRCOLL
-static
 ZEND_BEGIN_ARG_INFO(arginfo_strcoll, 0)
        ZEND_ARG_INFO(0, str1)
        ZEND_ARG_INFO(0, str2)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_trim, 0, 0, 1)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, character_mask)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_rtrim, 0, 0, 1)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, character_mask)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_ltrim, 0, 0, 1)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, character_mask)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_wordwrap, 0, 0, 1)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, width)
@@ -2535,120 +2141,101 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_wordwrap, 0, 0, 1)
        ZEND_ARG_INFO(0, cut)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_explode, 0, 0, 2)
        ZEND_ARG_INFO(0, separator)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, limit)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_implode, 0)
        ZEND_ARG_INFO(0, glue)
        ZEND_ARG_INFO(0, pieces)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_strtok, 0)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, token)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_strtoupper, 0)
        ZEND_ARG_INFO(0, str)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_strtolower, 0)
        ZEND_ARG_INFO(0, str)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_strtotitle, 0)
        ZEND_ARG_INFO(0, str)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_basename, 0, 0, 1)
        ZEND_ARG_INFO(0, path)
        ZEND_ARG_INFO(0, suffix)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_dirname, 0)
        ZEND_ARG_INFO(0, path)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_pathinfo, 0, 0, 1)
        ZEND_ARG_INFO(0, path)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stristr, 0, 0, 2)
        ZEND_ARG_INFO(0, haystack)
        ZEND_ARG_INFO(0, needle)
        ZEND_ARG_INFO(0, part)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_strstr, 0, 0, 2)
        ZEND_ARG_INFO(0, haystack)
        ZEND_ARG_INFO(0, needle)
        ZEND_ARG_INFO(0, part)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_strpos, 0, 0, 2)
        ZEND_ARG_INFO(0, haystack)
        ZEND_ARG_INFO(0, needle)
        ZEND_ARG_INFO(0, offset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stripos, 0, 0, 2)
        ZEND_ARG_INFO(0, haystack)
        ZEND_ARG_INFO(0, needle)
        ZEND_ARG_INFO(0, offset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_strrpos, 0, 0, 2)
        ZEND_ARG_INFO(0, haystack)
        ZEND_ARG_INFO(0, needle)
        ZEND_ARG_INFO(0, offset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_strripos, 0, 0, 2)
        ZEND_ARG_INFO(0, haystack)
        ZEND_ARG_INFO(0, needle)
        ZEND_ARG_INFO(0, offset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_strrchr, 0)
        ZEND_ARG_INFO(0, haystack)
        ZEND_ARG_INFO(0, needle)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_chunk_split, 0, 0, 1)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, chunklen)
        ZEND_ARG_INFO(0, ending)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_substr, 0, 0, 2)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, start)
        ZEND_ARG_INFO(0, length)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_substr_replace, 0, 0, 3)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, replace)
@@ -2656,77 +2243,63 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_substr_replace, 0, 0, 3)
        ZEND_ARG_INFO(0, length)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_quotemeta, 0)
        ZEND_ARG_INFO(0, str)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ord, 0)
        ZEND_ARG_INFO(0, character)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_chr, 0)
        ZEND_ARG_INFO(0, codepoint)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ucfirst, 0)
        ZEND_ARG_INFO(0, str)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_lcfirst, 0)
        ZEND_ARG_INFO(0, str)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_ucwords, 0)
        ZEND_ARG_INFO(0, str)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_strtr, 0, 0, 2)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, from)
        ZEND_ARG_INFO(0, to)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_strrev, 0)
        ZEND_ARG_INFO(0, str)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_similar_text, 0, 0, 2)
        ZEND_ARG_INFO(0, str1)
        ZEND_ARG_INFO(0, str2)
        ZEND_ARG_INFO(1, percent)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_addcslashes, 0)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, charlist)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_addslashes, 0)
        ZEND_ARG_INFO(0, str)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_stripcslashes, 0)
        ZEND_ARG_INFO(0, str)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_stripslashes, 0)
        ZEND_ARG_INFO(0, str)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_str_replace, 0, 0, 3)
        ZEND_ARG_INFO(0, search)
        ZEND_ARG_INFO(0, replace)
@@ -2734,7 +2307,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_str_replace, 0, 0, 3)
        ZEND_ARG_INFO(1, replace_count)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_str_ireplace, 0, 0, 3)
        ZEND_ARG_INFO(0, search)
        ZEND_ARG_INFO(0, replace)
@@ -2742,44 +2314,37 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_str_ireplace, 0, 0, 3)
        ZEND_ARG_INFO(1, replace_count)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_hebrev, 0, 0, 1)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, max_chars_per_line)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_hebrevc, 0, 0, 1)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, max_chars_per_line)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_nl2br, 0, 0, 1)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, is_xhtml)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_strip_tags, 0, 0, 1)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, allowable_tags)
 ZEND_END_ARG_INFO()
 
-static
 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_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_parse_str, 0, 0, 1)
        ZEND_ARG_INFO(0, encoded_string)
        ZEND_ARG_INFO(1, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_str_getcsv, 0, 0, 1)
        ZEND_ARG_INFO(0, string)
        ZEND_ARG_INFO(0, delimiter)
@@ -2787,35 +2352,29 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_str_getcsv, 0, 0, 1)
        ZEND_ARG_INFO(0, escape)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_str_repeat, 0)
        ZEND_ARG_INFO(0, input)
        ZEND_ARG_INFO(0, mult)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_count_chars, 0, 0, 1)
        ZEND_ARG_INFO(0, input)
        ZEND_ARG_INFO(0, mode)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_strnatcmp, 0)
        ZEND_ARG_INFO(0, s1)
        ZEND_ARG_INFO(0, s2)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_localeconv, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_strnatcasecmp, 0)
        ZEND_ARG_INFO(0, s1)
        ZEND_ARG_INFO(0, s2)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_substr_count, 0, 0, 2)
        ZEND_ARG_INFO(0, haystack)
        ZEND_ARG_INFO(0, needle)
@@ -2823,7 +2382,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_substr_count, 0, 0, 2)
        ZEND_ARG_INFO(0, length)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_str_pad, 0, 0, 2)
        ZEND_ARG_INFO(0, input)
        ZEND_ARG_INFO(0, pad_length)
@@ -2831,24 +2389,20 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_str_pad, 0, 0, 2)
        ZEND_ARG_INFO(0, pad_type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sscanf, 1, 0, 2)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, format)
        ZEND_ARG_INFO(1, ...)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_str_rot13, 0)
        ZEND_ARG_INFO(0, str)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_str_shuffle, 0)
        ZEND_ARG_INFO(0, str)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_str_word_count, 0, 0, 1)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, format)
@@ -2856,26 +2410,22 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_str_word_count, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 #ifdef HAVE_STRFMON
-static
 ZEND_BEGIN_ARG_INFO(arginfo_money_format, 0)
        ZEND_ARG_INFO(0, format)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_str_split, 0, 0, 1)
        ZEND_ARG_INFO(0, str)
        ZEND_ARG_INFO(0, split_length)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_strpbrk, 0, 0, 1)
        ZEND_ARG_INFO(0, haystack)
        ZEND_ARG_INFO(0, char_list)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_substr_compare, 0, 0, 3)
        ZEND_ARG_INFO(0, main_str)
        ZEND_ARG_INFO(0, str)
@@ -2887,18 +2437,15 @@ ZEND_END_ARG_INFO()
 /* {{{ syslog.c */
 #ifdef HAVE_SYSLOG_H
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_openlog, 0)
        ZEND_ARG_INFO(0, ident)
        ZEND_ARG_INFO(0, option)
        ZEND_ARG_INFO(0, facility)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_closelog, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_syslog, 0)
        ZEND_ARG_INFO(0, priority)
        ZEND_ARG_INFO(0, message)
@@ -2906,99 +2453,80 @@ ZEND_END_ARG_INFO()
 #endif
 /* }}} */
 /* {{{ type.c */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_gettype, 0)
        ZEND_ARG_INFO(0, var)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_settype, 0)
        ZEND_ARG_INFO(1, var)
        ZEND_ARG_INFO(0, type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_intval, 0, 0, 1)
        ZEND_ARG_INFO(0, var)
        ZEND_ARG_INFO(0, base)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_floatval, 0)
        ZEND_ARG_INFO(0, var)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_strval, 0)
        ZEND_ARG_INFO(0, var)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_is_null, 0)
        ZEND_ARG_INFO(0, var)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_is_resource, 0)
        ZEND_ARG_INFO(0, var)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_is_bool, 0)
        ZEND_ARG_INFO(0, var)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_is_long, 0)
        ZEND_ARG_INFO(0, var)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_is_float, 0)
        ZEND_ARG_INFO(0, var)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_is_binary, 0)
        ZEND_ARG_INFO(0, var)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_is_string, 0)
        ZEND_ARG_INFO(0, var)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_is_unicode, 0)
        ZEND_ARG_INFO(0, var)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_is_buffer, 0)
        ZEND_ARG_INFO(0, var)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_is_array, 0)
        ZEND_ARG_INFO(0, var)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_is_object, 0)
        ZEND_ARG_INFO(0, var)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_is_numeric, 0)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_is_scalar, 0)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_is_callable, 0, 0, 1)
        ZEND_ARG_INFO(0, var)
        ZEND_ARG_INFO(0, syntax_only)
@@ -3007,7 +2535,6 @@ ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ uniqid.c */
 #ifdef HAVE_GETTIMEOFDAY
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_uniqid, 0, 0, 0)
        ZEND_ARG_INFO(0, prefix)
        ZEND_ARG_INFO(0, more_entropy)
@@ -3015,130 +2542,107 @@ ZEND_END_ARG_INFO()
 #endif
 /* }}} */
 /* {{{ url.c */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_parse_url, 0, 0, 1)
        ZEND_ARG_INFO(0, url)
        ZEND_ARG_INFO(0, component)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_urlencode, 0)
        ZEND_ARG_INFO(0, str)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_urldecode, 0)
        ZEND_ARG_INFO(0, str)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_rawurlencode, 0)
        ZEND_ARG_INFO(0, str)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_rawurldecode, 0)
        ZEND_ARG_INFO(0, str)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_get_headers, 0, 0, 1)
        ZEND_ARG_INFO(0, url)
        ZEND_ARG_INFO(0, format)
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ user_filters.c */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_stream_bucket_make_writeable, 0)
        ZEND_ARG_INFO(0, brigade)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_stream_bucket_prepend, 0)
        ZEND_ARG_INFO(0, brigade)
        ZEND_ARG_INFO(0, bucket)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_stream_bucket_append, 0)
        ZEND_ARG_INFO(0, brigade)
        ZEND_ARG_INFO(0, bucket)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_stream_bucket_new, 0)
        ZEND_ARG_INFO(0, stream)
        ZEND_ARG_INFO(0, buffer)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_stream_get_filters, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_stream_filter_register, 0)
        ZEND_ARG_INFO(0, filtername)
        ZEND_ARG_INFO(0, classname)
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ uuencode.c */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_convert_uuencode, 0)
        ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_convert_uudecode, 0)
        ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ var.c */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_var_dump, 0, 0, 1)
        ZEND_ARG_INFO(0, var)
        ZEND_ARG_INFO(0, ...)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_var_inspect, 0, 0, 1)
        ZEND_ARG_INFO(0, var)
        ZEND_ARG_INFO(0, ...)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_debug_zval_dump, 0, 0, 1)
        ZEND_ARG_INFO(0, var)
        ZEND_ARG_INFO(0, ...)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_var_export, 0, 0, 1)
        ZEND_ARG_INFO(0, var)
        ZEND_ARG_INFO(0, return)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_serialize, 0)
        ZEND_ARG_INFO(0, var)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_unserialize, 0)
        ZEND_ARG_INFO(0, variable_representation)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_memory_get_usage, 0, 0, 0)
        ZEND_ARG_INFO(0, real_usage)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_memory_get_peak_usage, 0, 0, 0)
        ZEND_ARG_INFO(0, real_usage)
 ZEND_END_ARG_INFO()
 /* }}} */
 /* {{{ versioning.c */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_version_compare, 0, 0, 2)
        ZEND_ARG_INFO(0, ver1)
        ZEND_ARG_INFO(0, ver2)

diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c
index 3d23d22b902b89cba3822e9f090fc498d4183e7b..5fb26e2dd701fa57984a9e2cf3b788c081d971da 100644 (file)
--- a/ext/standard/user_filters.c
+++ b/ext/standard/user_filters.c
@@ -59,7 +59,6 @@ static PHP_FUNCTION(user_filter_nop)
 }
 /* }}} */
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_php_user_filter_filter, 0)
        ZEND_ARG_INFO(0, in)
        ZEND_ARG_INFO(0, out)
@@ -67,11 +66,9 @@ ZEND_BEGIN_ARG_INFO(arginfo_php_user_filter_filter, 0)
        ZEND_ARG_INFO(0, closing)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_php_user_filter_onCreate, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_php_user_filter_onClose, 0)
 ZEND_END_ARG_INFO()
 

diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c
index 575f10ef09fba0615200fceb108542a0685d70c0..02b84ef65a03756e7f99194186b683f41b0755c8 100644 (file)
--- a/ext/sybase_ct/php_sybase_ct.c
+++ b/ext/sybase_ct/php_sybase_ct.c
@@ -42,7 +42,6 @@ static PHP_GINIT_FUNCTION(sybase);
 static PHP_GSHUTDOWN_FUNCTION(sybase);
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_connect, 0, 0, 0)
        ZEND_ARG_INFO(0, host)
        ZEND_ARG_INFO(0, user)
@@ -51,7 +50,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_connect, 0, 0, 0)
        ZEND_ARG_INFO(0, appname)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_pconnect, 0, 0, 0)
        ZEND_ARG_INFO(0, host)
        ZEND_ARG_INFO(0, user)
@@ -60,116 +58,95 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_pconnect, 0, 0, 0)
        ZEND_ARG_INFO(0, appname)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_close, 0, 0, 0)
        ZEND_ARG_INFO(0, link_id)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_select_db, 0, 0, 1)
        ZEND_ARG_INFO(0, database)
        ZEND_ARG_INFO(0, link_id)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_query, 0, 0, 1)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_INFO(0, link_id)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_unbuffered_query, 0, 0, 1)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_INFO(0, link_id)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_free_result, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_get_last_message, 0, 0, 1)
        ZEND_ARG_INFO(0, d)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_num_rows, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_num_fields, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_fetch_row, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_fetch_object, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, object)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_fetch_array, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_fetch_assoc, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_data_seek, 0, 0, 2)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, offset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_fetch_field, 0, 0, 1)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, offset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_field_seek, 0, 0, 2)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, offset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_result, 0, 0, 3)
        ZEND_ARG_INFO(0, result)
        ZEND_ARG_INFO(0, row)
        ZEND_ARG_INFO(0, field)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_affected_rows, 0, 0, 0)
        ZEND_ARG_INFO(0, link_id)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_min_client_severity, 0, 0, 1)
        ZEND_ARG_INFO(0, severity)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_min_server_severity, 0, 0, 1)
        ZEND_ARG_INFO(0, severity)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_deadlock_retry_count, 0, 0, 1)
        ZEND_ARG_INFO(0, retry_count)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_sybase_set_message_handler, 0, 0, 1)
        ZEND_ARG_INFO(0, error_func)
        ZEND_ARG_INFO(0, connection)

diff --git a/ext/sysvmsg/sysvmsg.c b/ext/sysvmsg/sysvmsg.c
index fe4a0f1a7dbc50f20dc6cd35d6562e3bb108df66..6023ab70e963e7405830f969743f03d02e7b1a9a 100644 (file)
--- a/ext/sysvmsg/sysvmsg.c
+++ b/ext/sysvmsg/sysvmsg.c
@@ -41,13 +41,11 @@
 static int le_sysvmsg;
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msg_get_queue, 0, 0, 1)
        ZEND_ARG_INFO(0, key)
        ZEND_ARG_INFO(0, perms)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msg_send, 0, 0, 3)
        ZEND_ARG_INFO(0, queue)
        ZEND_ARG_INFO(0, msgtype)
@@ -57,7 +55,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_msg_send, 0, 0, 3)
        ZEND_ARG_INFO(1, errorcode)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msg_receive, 0, 0, 5)
        ZEND_ARG_INFO(0, queue)
        ZEND_ARG_INFO(0, desiredmsgtype)
@@ -69,23 +66,19 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_msg_receive, 0, 0, 5)
        ZEND_ARG_INFO(1, errorcode)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msg_remove_queue, 0, 0, 1)
        ZEND_ARG_INFO(0, queue)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msg_stat_queue, 0, 0, 1)
        ZEND_ARG_INFO(0, queue)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msg_set_queue, 0, 0, 2)
        ZEND_ARG_INFO(0, queue)
        ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_msg_queue_exists, 0, 0, 1)
        ZEND_ARG_INFO(0, key)
 ZEND_END_ARG_INFO()

diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c
index cda0418560d637797947bd3b85f76a915a371e7e..07cef04b443d68d926dc55699d4f0d571300b8a3 100644 (file)
--- a/ext/sysvshm/sysvshm.c
+++ b/ext/sysvshm/sysvshm.c
@@ -40,43 +40,36 @@
 #include "php_ini.h"
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_shm_attach, 0, 0, 1)
        ZEND_ARG_INFO(0, key)
        ZEND_ARG_INFO(0, memsize)
        ZEND_ARG_INFO(0, perm)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_shm_detach, 0, 0, 1)
        ZEND_ARG_INFO(0, shm_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_shm_remove, 0, 0, 1)
        ZEND_ARG_INFO(0, shm_identifier)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_shm_put_var, 0, 0, 3)
        ZEND_ARG_INFO(0, shm_identifier)
        ZEND_ARG_INFO(0, variable_key)
        ZEND_ARG_INFO(0, variable)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_shm_get_var, 0, 0, 2)
        ZEND_ARG_INFO(0, id)
        ZEND_ARG_INFO(0, variable_key)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_shm_has_var, 0, 0, 2)
        ZEND_ARG_INFO(0, id)
        ZEND_ARG_INFO(0, variable_key)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_shm_remove_var, 0, 0, 2)
        ZEND_ARG_INFO(0, id)
        ZEND_ARG_INFO(0, variable_key)

diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index 573eaa1111b0041816f146d54f24e763a10e1b52..0838145325110b18f0d5995208cdc2b2df9a01d2 100644 (file)
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -287,22 +287,18 @@ STD_PHP_INI_ENTRY("tidy.clean_output",            "0",    PHP_INI_USER,           php_tidy_set_clean_o
 PHP_INI_END()
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_parse_string, 0, 0, 1)
        ZEND_ARG_INFO(0, input)
        ZEND_ARG_INFO(0, config_options)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_tidy_get_error_buffer, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_tidy_get_output, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_parse_file, 0, 0, 1)
        ZEND_ARG_INFO(0, file)
        ZEND_ARG_INFO(0, config_options)
@@ -310,18 +306,15 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_parse_file, 0, 0, 1)
        ZEND_ARG_INFO(0, use_include_path)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_tidy_clean_repair, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_repair_string, 0, 0, 1)
        ZEND_ARG_INFO(0, data)
        ZEND_ARG_INFO(0, config_file)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_repair_file, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, config_file)
@@ -329,76 +322,59 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_repair_file, 0, 0, 1)
        ZEND_ARG_INFO(0, use_include_path)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_tidy_diagnose, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_tidy_get_release, 0)
 ZEND_END_ARG_INFO()
 
 #if HAVE_TIDYOPTGETDOC
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_get_opt_doc, 0, 0, 2)
        ZEND_ARG_INFO(0, resource)
        ZEND_ARG_INFO(0, optname)
 ZEND_END_ARG_INFO()
 #endif
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_tidy_get_config, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_tidy_get_status, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_tidy_get_html_ver, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_tidy_is_xhtml, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_tidy_is_xml, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_tidy_error_count, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_tidy_warning_count, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_tidy_access_count, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_tidy_config_count, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_getopt, 0, 0, 1)
        ZEND_ARG_INFO(0, option)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_tidy_get_root, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_tidy_get_html, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_tidy_get_head, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_tidy_get_body, 0, 0, 1)
        ZEND_ARG_INFO(0, tidy)
 ZEND_END_ARG_INFO()

diff --git a/ext/tokenizer/tokenizer.c b/ext/tokenizer/tokenizer.c
index ed0249cb7e7488e2c63e86f2309c4936662c363b..2ef27e3b00612810ccf15aa463de7975206b19f9 100644 (file)
--- a/ext/tokenizer/tokenizer.c
+++ b/ext/tokenizer/tokenizer.c
@@ -36,12 +36,10 @@
 #define zendleng LANG_SCNG(yy_leng)
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_token_get_all, 0, 0, 1)
        ZEND_ARG_INFO(0, source)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_token_name, 0, 0, 1)
        ZEND_ARG_INFO(0, token)
 ZEND_END_ARG_INFO()

diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index baf9c5eaf2d8e19986ac7a477d695add8f50a5a9..a5d2b94e385550f1473282f3a0f671ac86a18be8 100644 (file)
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -103,36 +103,30 @@ typedef struct {
 static void php_wddx_process_data(void *user_data, const XML_Char *s, int len);
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_wddx_serialize_value, 0, 0, 1)
        ZEND_ARG_INFO(0, var)
        ZEND_ARG_INFO(0, comment)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_wddx_serialize_vars, 0, 0, 1)
        ZEND_ARG_INFO(0, var_name)
        ZEND_ARG_INFO(0, ...)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_wddx_serialize_start, 0, 0, 0)
        ZEND_ARG_INFO(0, comment)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_wddx_packet_end, 0, 0, 1)
        ZEND_ARG_INFO(0, packet_id)
 ZEND_END_ARG_INFO()
 
-static
 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_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_wddx_unserialize, 0, 0, 1)
        ZEND_ARG_INFO(0, packet)
 ZEND_END_ARG_INFO()

diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index 9a5a921abc3021c7dba022f9a59de5b587781364..9a52ff244c08228516302d1965dece87ee3652c1 100644 (file)
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -96,86 +96,72 @@ void _xml_endNamespaceDeclHandler(void *, const XML_Char *);
 /* }}} */
 
 /* {{{ extension definition structures */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_parser_create, 0, 0, 0)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_parser_create_ns, 0, 0, 0)
        ZEND_ARG_INFO(0, encoding)
        ZEND_ARG_INFO(0, sep)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_set_object, 0, 0, 2)
        ZEND_ARG_INFO(0, parser)
        ZEND_ARG_INFO(1, obj)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_set_element_handler, 0, 0, 3)
        ZEND_ARG_INFO(0, parser)
        ZEND_ARG_INFO(0, shdl)
        ZEND_ARG_INFO(0, ehdl)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_set_character_data_handler, 0, 0, 2)
        ZEND_ARG_INFO(0, parser)
        ZEND_ARG_INFO(0, hdl)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_set_processing_instruction_handler, 0, 0, 2)
        ZEND_ARG_INFO(0, parser)
        ZEND_ARG_INFO(0, hdl)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_set_default_handler, 0, 0, 2)
        ZEND_ARG_INFO(0, parser)
        ZEND_ARG_INFO(0, hdl)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_set_unparsed_entity_decl_handler, 0, 0, 2)
        ZEND_ARG_INFO(0, parser)
        ZEND_ARG_INFO(0, hdl)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_set_notation_decl_handler, 0, 0, 2)
        ZEND_ARG_INFO(0, parser)
        ZEND_ARG_INFO(0, hdl)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_set_external_entity_ref_handler, 0, 0, 2)
        ZEND_ARG_INFO(0, parser)
        ZEND_ARG_INFO(0, hdl)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_set_start_namespace_decl_handler, 0, 0, 2)
        ZEND_ARG_INFO(0, parser)
        ZEND_ARG_INFO(0, hdl)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_set_end_namespace_decl_handler, 0, 0, 2)
        ZEND_ARG_INFO(0, parser)
        ZEND_ARG_INFO(0, hdl)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_parse, 0, 0, 2)
        ZEND_ARG_INFO(0, parser)
        ZEND_ARG_INFO(0, data)
        ZEND_ARG_INFO(0, isfinal)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_parse_into_struct, 0, 0, 3)
        ZEND_ARG_INFO(0, parser)
        ZEND_ARG_INFO(0, data)
@@ -183,55 +169,45 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_parse_into_struct, 0, 0, 3)
        ZEND_ARG_INFO(1, index)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_get_error_code, 0, 0, 1)
        ZEND_ARG_INFO(0, parser)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_error_string, 0, 0, 1)
        ZEND_ARG_INFO(0, code)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_get_current_line_number, 0, 0, 1)
        ZEND_ARG_INFO(0, parser)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_get_current_column_number, 0, 0, 1)
        ZEND_ARG_INFO(0, parser)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_get_current_byte_index, 0, 0, 1)
        ZEND_ARG_INFO(0, parser)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_parser_free, 0, 0, 1)
        ZEND_ARG_INFO(0, parser)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_parser_set_option, 0, 0, 3)
        ZEND_ARG_INFO(0, parser)
        ZEND_ARG_INFO(0, option)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xml_parser_get_option, 0, 0, 2)
        ZEND_ARG_INFO(0, parser)
        ZEND_ARG_INFO(0, option)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_utf8_encode, 0, 0, 1)
        ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_utf8_decode, 0, 0, 1)
        ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO()

diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c
index c8adcf957f3e67f618a382bb4973d0584f2dd85a..8ad0c2d79b05aaa912e42860853ed87eeec11b8e 100644 (file)
--- a/ext/xmlreader/php_xmlreader.c
+++ b/ext/xmlreader/php_xmlreader.c
@@ -1224,125 +1224,100 @@ PHP_METHOD(xmlreader, expand)
 }
 /* }}} */
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_close, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_getAttribute, 0)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_getAttributeNo, 0)
        ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_getAttributeNs, 0)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, namespaceURI)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_getParserProperty, 0)
        ZEND_ARG_INFO(0, property)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_isValid, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_lookupNamespace, 0)
 ZEND_ARG_INFO(0, prefix)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_moveToAttribute, 0)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_moveToAttributeNo, 0)
        ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_moveToAttributeNs, 0)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, namespaceURI)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_moveToElement, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_moveToFirstAttribute, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_moveToNextAttribute, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_read, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlreader_next, 0, 0, 0)
        ZEND_ARG_INFO(0, localname)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlreader_open, 0, 0, 1)
        ZEND_ARG_INFO(0, URI)
        ZEND_ARG_INFO(0, encoding)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_readInnerXml, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_readOuterXml, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_readString, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_setSchema, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_setParserProperty, 0)
        ZEND_ARG_INFO(0, property)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_setRelaxNGSchema, 0)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_setRelaxNGSchemaSource, 0)
        ZEND_ARG_INFO(0, source)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlreader_XML, 0, 0, 1)
        ZEND_ARG_INFO(0, source)
        ZEND_ARG_INFO(0, encoding)
        ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_xmlreader_expand, 0)
 ZEND_END_ARG_INFO()
 /* }}} */

diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c
index 6a57afd64d7a2a5c13b7b4cfd0de8970a3790b48..02caf5923462d044f60146ca6995aaf8a3ca8b24 100644 (file)
--- a/ext/xmlrpc/xmlrpc-epi-php.c
+++ b/ext/xmlrpc/xmlrpc-epi-php.c
@@ -76,59 +76,49 @@
 static int le_xmlrpc_server;
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlrpc_encode, 0, 0, 1)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlrpc_decode, 0, 0, 1)
        ZEND_ARG_INFO(0, value)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlrpc_decode_request, 0, 0, 2)
        ZEND_ARG_INFO(0, xml)
        ZEND_ARG_INFO(1, method)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlrpc_encode_request, 0, 0, 2)
        ZEND_ARG_INFO(0, method)
        ZEND_ARG_INFO(0, params)
        ZEND_ARG_INFO(0, output_options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlrpc_set_type, 0, 0, 2)
        ZEND_ARG_INFO(1, value)
        ZEND_ARG_INFO(0, type)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlrpc_is_fault, 0, 0, 1)
        ZEND_ARG_INFO(0, arg)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO(arginfo_xmlrpc_server_create, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlrpc_server_destroy, 0, 0, 1)
        ZEND_ARG_INFO(0, server)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlrpc_server_register_method, 0, 0, 3)
        ZEND_ARG_INFO(0, server)
        ZEND_ARG_INFO(0, method_name)
        ZEND_ARG_INFO(0, function)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlrpc_server_call_method, 0, 0, 3)
        ZEND_ARG_INFO(0, server)
        ZEND_ARG_INFO(0, xml)
@@ -136,18 +126,15 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlrpc_server_call_method, 0, 0, 3)
        ZEND_ARG_INFO(0, output_options)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlrpc_parse_method_descriptions, 0, 0, 1)
        ZEND_ARG_INFO(0, xml)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlrpc_server_add_introspection_data, 0, 0, 2)
        ZEND_ARG_INFO(0, server)
        ZEND_ARG_INFO(0, desc)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlrpc_server_register_introspection_callback, 0, 0, 2)
        ZEND_ARG_INFO(0, server)
        ZEND_ARG_INFO(0, function)

diff --git a/ext/xmlwriter/php_xmlwriter.c b/ext/xmlwriter/php_xmlwriter.c
index 5902afa34470122b86875fe3bee25b6a5f50f798..59d1c33460931f34fd9c816f3084b036e9ed2194 100644 (file)
--- a/ext/xmlwriter/php_xmlwriter.c
+++ b/ext/xmlwriter/php_xmlwriter.c
@@ -173,54 +173,44 @@ static zend_object_value xmlwriter_object_new(zend_class_entry *class_type TSRML
        }       \
        
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_xmlwriter_void, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_resource, 0, 0, 1)
        ZEND_ARG_INFO(0, xmlwriter)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_open_uri, 0, 0, 1)
        ZEND_ARG_INFO(0, uri)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_set_indent, 0, 0, 2)
        ZEND_ARG_INFO(0, xmlwriter)
        ZEND_ARG_INFO(0, indent)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_set_indent, 0, 0, 1)
        ZEND_ARG_INFO(0, indent)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_set_indent_string, 0, 0, 2)
        ZEND_ARG_INFO(0, xmlwriter)
        ZEND_ARG_INFO(0, indentString)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_set_indent_string, 0, 0, 1)
        ZEND_ARG_INFO(0, indentString)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_start_attribute, 0, 0, 2)
        ZEND_ARG_INFO(0, xmlwriter)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_start_attribute, 0, 0, 1)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_start_attribute_ns, 0, 0, 4)
        ZEND_ARG_INFO(0, xmlwriter)
        ZEND_ARG_INFO(0, prefix)
@@ -228,14 +218,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_start_attribute_ns, 0, 0, 4)
        ZEND_ARG_INFO(0, uri)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_start_attribute_ns, 0, 0, 3)
        ZEND_ARG_INFO(0, prefix)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, uri)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_write_attribute_ns, 0, 0, 5)
        ZEND_ARG_INFO(0, xmlwriter)
        ZEND_ARG_INFO(0, prefix)
@@ -244,7 +232,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_write_attribute_ns, 0, 0, 5)
        ZEND_ARG_INFO(0, content)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_write_attribute_ns, 0, 0, 4)
        ZEND_ARG_INFO(0, prefix)
        ZEND_ARG_INFO(0, name)
@@ -252,31 +239,26 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_write_attribute_ns, 0, 0, 4)
        ZEND_ARG_INFO(0, content)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_write_attribute, 0, 0, 3)
        ZEND_ARG_INFO(0, xmlwriter)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_write_attribute, 0, 0, 2)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_start_element, 0, 0, 2)
        ZEND_ARG_INFO(0, xmlwriter)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_start_element, 0, 0, 1)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_start_element_ns, 0, 0, 4)
        ZEND_ARG_INFO(0, xmlwriter)
        ZEND_ARG_INFO(0, prefix)
@@ -284,27 +266,23 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_start_element_ns, 0, 0, 4)
        ZEND_ARG_INFO(0, uri)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_start_element_ns, 0, 0, 3)
        ZEND_ARG_INFO(0, prefix)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, uri)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_write_element, 0, 0, 2)
        ZEND_ARG_INFO(0, xmlwriter)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, content)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_write_element, 0, 0, 1)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, content)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_write_element_ns, 0, 0, 4)
        ZEND_ARG_INFO(0, xmlwriter)
        ZEND_ARG_INFO(0, prefix)
@@ -313,7 +291,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_write_element_ns, 0, 0, 4)
        ZEND_ARG_INFO(0, content)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_write_element_ns, 0, 0, 3)
        ZEND_ARG_INFO(0, prefix)
        ZEND_ARG_INFO(0, name)
@@ -321,64 +298,53 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_write_element_ns, 0, 0, 3)
        ZEND_ARG_INFO(0, content)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_start_pi, 0, 0, 2)
        ZEND_ARG_INFO(0, xmlwriter)
        ZEND_ARG_INFO(0, target)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_start_pi, 0, 0, 1)
        ZEND_ARG_INFO(0, target)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_write_pi, 0, 0, 3)
        ZEND_ARG_INFO(0, xmlwriter)
        ZEND_ARG_INFO(0, target)
        ZEND_ARG_INFO(0, content)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_write_pi, 0, 0, 2)
        ZEND_ARG_INFO(0, target)
        ZEND_ARG_INFO(0, content)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_write_cdata, 0, 0, 2)
        ZEND_ARG_INFO(0, xmlwriter)
        ZEND_ARG_INFO(0, content)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_write_cdata, 0, 0, 1)
        ZEND_ARG_INFO(0, content)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_text, 0, 0, 2)
        ZEND_ARG_INFO(0, xmlwriter)
        ZEND_ARG_INFO(0, content)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_text, 0, 0, 1)
        ZEND_ARG_INFO(0, content)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_write_raw, 0, 0, 2)
        ZEND_ARG_INFO(0, xmlwriter)
        ZEND_ARG_INFO(0, content)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_write_raw, 0, 0, 1)
        ZEND_ARG_INFO(0, content)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_start_document, 0, 0, 1)
        ZEND_ARG_INFO(0, xmlwriter)
        ZEND_ARG_INFO(0, version)
@@ -386,25 +352,21 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_start_document, 0, 0, 1)
        ZEND_ARG_INFO(0, standalone)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_start_document, 0, 0, 0)
        ZEND_ARG_INFO(0, version)
        ZEND_ARG_INFO(0, encoding)
        ZEND_ARG_INFO(0, standalone)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_write_comment, 0, 0, 2)
        ZEND_ARG_INFO(0, xmlwriter)
        ZEND_ARG_INFO(0, content)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_write_comment, 0, 0, 1)
        ZEND_ARG_INFO(0, content)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_start_dtd, 0, 0, 2)
        ZEND_ARG_INFO(0, xmlwriter)
        ZEND_ARG_INFO(0, qualifiedName)
@@ -412,14 +374,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_start_dtd, 0, 0, 2)
        ZEND_ARG_INFO(0, systemId)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_start_dtd, 0, 0, 1)
        ZEND_ARG_INFO(0, qualifiedName)
        ZEND_ARG_INFO(0, publicId)
        ZEND_ARG_INFO(0, systemId)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_write_dtd, 0, 0, 2)
        ZEND_ARG_INFO(0, xmlwriter)
        ZEND_ARG_INFO(0, name)
@@ -428,7 +388,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_write_dtd, 0, 0, 2)
        ZEND_ARG_INFO(0, subset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_write_dtd, 0, 0, 1)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, publicId)
@@ -436,98 +395,82 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_write_dtd, 0, 0, 1)
        ZEND_ARG_INFO(0, subset)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_start_dtd_element, 0, 0, 2)
        ZEND_ARG_INFO(0, xmlwriter)
        ZEND_ARG_INFO(0, qualifiedName)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_start_dtd_element, 0, 0, 1)
        ZEND_ARG_INFO(0, qualifiedName)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_write_dtd_element, 0, 0, 3)
        ZEND_ARG_INFO(0, xmlwriter)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, content)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_write_dtd_element, 0, 0, 2)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, content)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_start_dtd_attlist, 0, 0, 2)
        ZEND_ARG_INFO(0, xmlwriter)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_start_dtd_attlist, 0, 0, 1)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_write_dtd_attlist, 0, 0, 3)
        ZEND_ARG_INFO(0, xmlwriter)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, content)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_write_dtd_attlist, 0, 0, 2)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, content)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_start_dtd_entity, 0, 0, 3)
        ZEND_ARG_INFO(0, xmlwriter)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, isparam)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_start_dtd_entity, 0, 0, 2)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, isparam)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_write_dtd_entity, 0, 0, 3)
        ZEND_ARG_INFO(0, xmlwriter)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, content)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_write_dtd_entity, 0, 0, 2)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, content)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_output_memory, 0, 0, 1)
        ZEND_ARG_INFO(0, xmlwriter)
        ZEND_ARG_INFO(0, flush)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_output_memory, 0, 0, 0)
        ZEND_ARG_INFO(0, flush)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_flush, 0, 0, 1)
        ZEND_ARG_INFO(0, xmlwriter)
        ZEND_ARG_INFO(0, empty)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xmlwriter_method_flush, 0, 0, 0)
        ZEND_ARG_INFO(0, empty)
 ZEND_END_ARG_INFO()

diff --git a/ext/xsl/xsltprocessor.c b/ext/xsl/xsltprocessor.c
index d441ff77387e8398555442cd9283f3e7cfb461e1..7cb02a0e4aefb1eb006b40383c4bd168edd460b2 100644 (file)
--- a/ext/xsl/xsltprocessor.c
+++ b/ext/xsl/xsltprocessor.c
@@ -28,56 +28,46 @@
 #include "ext/libxml/php_libxml.h"
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_import_stylesheet, 0, 0, 1)
        ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_transform_to_doc, 0, 0, 1)
        ZEND_ARG_OBJ_INFO(0, doc, DOMNode, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_transform_to_uri, 0, 0, 2)
        ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
        ZEND_ARG_INFO(0, uri)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_transform_to_xml, 0, 0, 1)
        ZEND_ARG_OBJ_INFO(0, doc, DOMDocument, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_set_parameter, 0, 0, 2)
        ZEND_ARG_INFO(0, namespace)
        ZEND_ARG_INFO(0, name)
        ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_get_parameter, 0, 0, 2)
        ZEND_ARG_INFO(0, namespace)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_remove_parameter, 0, 0, 2)
        ZEND_ARG_INFO(0, namespace)
        ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_has_exslt_support, 0, 0, 0)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_register_php_functions, 0, 0, 0)
        ZEND_ARG_INFO(0, restrict)
 ZEND_END_ARG_INFO();
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_xsl_xsltprocessor_set_profiling, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO();

diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index 7e140f6bd8ee56682d80948d5558e236bbb82f6a..27856a62118ac0e2fb9e0d014cbfce502210f11e 100644 (file)
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -668,55 +668,45 @@ int php_zip_pcre(char *regexp, int regexp_len, char *path, int path_len, zval *r
 #endif
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_zip_open, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_zip_close, 0, 0, 1)
        ZEND_ARG_INFO(0, zip)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_zip_read, 0, 0, 1)
        ZEND_ARG_INFO(0, zip)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_zip_entry_open, 0, 0, 2)
        ZEND_ARG_INFO(0, zip_dp)
        ZEND_ARG_INFO(0, zip_entry)
        ZEND_ARG_INFO(0, mode)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_zip_entry_close, 0, 0, 1)
        ZEND_ARG_INFO(0, zip_ent)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_zip_entry_read, 0, 0, 1)
        ZEND_ARG_INFO(0, zip_entry)
        ZEND_ARG_INFO(0, len)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_zip_entry_name, 0, 0, 1)
        ZEND_ARG_INFO(0, zip_entry)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_zip_entry_compressedsize, 0, 0, 1)
        ZEND_ARG_INFO(0, zip_entry)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_zip_entry_filesize, 0, 0, 1)
        ZEND_ARG_INFO(0, zip_entry)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_zip_entry_compressionmethod, 0, 0, 1)
        ZEND_ARG_INFO(0, zip_entry)
 ZEND_END_ARG_INFO()

diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 42666b7f1132956cf797ee6f82fe577fdf83d98e..7ebd10406ef8cdc947fe44a204253b33fb1bde82 100644 (file)
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -630,76 +630,64 @@ ZEND_GET_MODULE(php_zlib)
 #endif
 
 /* {{{ arginfo */
-static
 ZEND_BEGIN_ARG_INFO(arginfo_zlib_get_coding_type, 0)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_gzfile, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, use_include_path)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_gzopen, 0, 0, 2)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, mode)
        ZEND_ARG_INFO(0, use_include_path)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_readgzfile, 0, 0, 1)
        ZEND_ARG_INFO(0, filename)
        ZEND_ARG_INFO(0, use_include_path)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_zlib_encode, 0, 0, 2)
        ZEND_ARG_INFO(0, data)
        ZEND_ARG_INFO(0, encoding)
        ZEND_ARG_INFO(0, level)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_zlib_decode, 0, 0, 1)
        ZEND_ARG_INFO(0, data)
        ZEND_ARG_INFO(0, max_decoded_len)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_gzdeflate, 0, 0, 1)
        ZEND_ARG_INFO(0, data)
        ZEND_ARG_INFO(0, level)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_gzencode, 0, 0, 1)
        ZEND_ARG_INFO(0, data)
        ZEND_ARG_INFO(0, level)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_gzcompress, 0, 0, 1)
        ZEND_ARG_INFO(0, data)
        ZEND_ARG_INFO(0, level)
        ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_gzinflate, 0, 0, 1)
        ZEND_ARG_INFO(0, data)
        ZEND_ARG_INFO(0, max_decoded_len)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_gzdecode, 0, 0, 1)
        ZEND_ARG_INFO(0, data)
        ZEND_ARG_INFO(0, max_decoded_len)
 ZEND_END_ARG_INFO()
 
-static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_gzuncompress, 0, 0, 1)
        ZEND_ARG_INFO(0, data)
        ZEND_ARG_INFO(0, max_decoded_len)