- Removed unused arguments

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 24376fa61cacacf3e6bcf31e2fade91a2d1c6a0a..5ac98b5b22a0b767c4fd6b4e681d87d0c8031eac 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -2898,7 +2898,7 @@ ZEND_API void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent
                zend_update_class_constants(parent_ce  TSRMLS_CC);
                zend_hash_apply_with_arguments(CE_STATIC_MEMBERS(parent_ce) TSRMLS_CC, (apply_func_args_t)inherit_static_prop, 1, &ce->default_static_members);
        } else {
-               zend_hash_apply_with_arguments(&parent_ce->default_static_members TSRMLS_CC, (apply_func_args_t)inherit_static_prop, 1, &ce->default_static_members TSRMLS_CC);
+               zend_hash_apply_with_arguments(&parent_ce->default_static_members TSRMLS_CC, (apply_func_args_t)inherit_static_prop, 1, &ce->default_static_members);
        }
        zend_hash_merge_ex(&ce->properties_info, &parent_ce->properties_info, (copy_ctor_func_t) (ce->type & ZEND_INTERNAL_CLASS ? zend_duplicate_property_info_internal : zend_duplicate_property_info), sizeof(zend_property_info), (merge_checker_func_t) do_inherit_property_access_check, ce);
 

diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index d8ea725ee96c0bed22b0309ebc760bd1aad8cb3b..2434fae25bffc20d0c9ac59f50b9c96df8c6b509 100644 (file)
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -1035,7 +1035,7 @@ static void _extension_string(string *str, zend_module_entry *module, char *inde
                int num_constants = 0;
                
                string_init(&str_constants);
-               zend_hash_apply_with_arguments(EG(zend_constants) TSRMLS_CC, (apply_func_args_t) _extension_const_string, 4, &str_constants, indent, module, &num_constants TSRMLS_CC);
+               zend_hash_apply_with_arguments(EG(zend_constants) TSRMLS_CC, (apply_func_args_t) _extension_const_string, 4, &str_constants, indent, module, &num_constants);
                if (num_constants) {
                        string_printf(str, "\n  - Constants [%d] {\n", num_constants);
                        string_append(str, &str_constants);
@@ -1072,7 +1072,7 @@ static void _extension_string(string *str, zend_module_entry *module, char *inde
                string_init(&sub_indent);
                string_printf(&sub_indent, "%s    ", indent);
                string_init(&str_classes);
-               zend_hash_apply_with_arguments(EG(class_table) TSRMLS_CC, (apply_func_args_t) _extension_class_string, 4, &str_classes, sub_indent.string, module, &num_classes TSRMLS_CC);
+               zend_hash_apply_with_arguments(EG(class_table) TSRMLS_CC, (apply_func_args_t) _extension_class_string, 4, &str_classes, sub_indent.string, module, &num_classes);
                if (num_classes) {
                        string_printf(str, "\n  - Classes [%d] {", num_classes);
                        string_append(str, &str_classes);
@@ -4821,7 +4821,7 @@ ZEND_METHOD(reflection_extension, getClasses)
        GET_REFLECTION_OBJECT_PTR(module);
 
        array_init(return_value);
-       zend_hash_apply_with_arguments(EG(class_table) TSRMLS_CC, (apply_func_args_t) add_extension_class, 3, return_value, module, 1 TSRMLS_CC);
+       zend_hash_apply_with_arguments(EG(class_table) TSRMLS_CC, (apply_func_args_t) add_extension_class, 3, return_value, module, 1);
 }
 /* }}} */
 
@@ -4836,7 +4836,7 @@ ZEND_METHOD(reflection_extension, getClassNames)
        GET_REFLECTION_OBJECT_PTR(module);
 
        array_init(return_value);
-       zend_hash_apply_with_arguments(EG(class_table) TSRMLS_CC, (apply_func_args_t) add_extension_class, 3, return_value, module, 0 TSRMLS_CC);
+       zend_hash_apply_with_arguments(EG(class_table) TSRMLS_CC, (apply_func_args_t) add_extension_class, 3, return_value, module, 0);
 }
 /* }}} */
 

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index c2a4e15a8c92060dc0d6846bda41633673953e11..b2aa51df7163f14a11079518bbb1e3ee7a88704c 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -4945,7 +4945,7 @@ static int add_config_entry_cb(zval *entry TSRMLS_DC, int num_args, va_list args
        } else if (Z_TYPE_P(entry) == IS_ARRAY) {
                MAKE_STD_ZVAL(tmp);
                array_init(tmp);
-               zend_hash_apply_with_arguments(Z_ARRVAL_P(entry) TSRMLS_CC, (apply_func_args_t) add_config_entry_cb, 1, tmp TSRMLS_CC);
+               zend_hash_apply_with_arguments(Z_ARRVAL_P(entry) TSRMLS_CC, (apply_func_args_t) add_config_entry_cb, 1, tmp);
                add_assoc_zval_ex(retval, hash_key->arKey.s, hash_key->nKeyLength, tmp);
        }
        return 0;