cvs: php-src /ext/reflection php_reflection.c /ext/standard basic_functions.c ZendEngine2 zend_compile.c

felipe Fri Aug 22 15:51:51 2008 UTC Modified files: /ZendEngine2 zend_compile.c /php-src/ext/standard basic_functions.c /php-src/ext/reflection php_reflection.c Log: - Removed unused arguments http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.c?r1=1.837&r2=1.838&diff_format=u Index: ZendEngine2/zend_compile.c diff -u ZendEngine2/zend_compile.c:1.837 ZendEngine2/zend_compile.c:1.838 --- ZendEngine2/zend_compile.c:1.837 Tue Aug 12 17:15:59 2008 +++ ZendEngine2/zend_compile.c Fri Aug 22 15:51:50 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_compile.c,v 1.837 2008/08/12 17:15:59 felipe Exp $ */ +/* $Id: zend_compile.c,v 1.838 2008/08/22 15:51:50 felipe Exp $ */ #include <zend_language_parser.h> #include "zend.h" @@ -2898,7 +2898,7 @@ 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); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.927&r2=1.928&diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.927 php-src/ext/standard/basic_functions.c:1.928 --- php-src/ext/standard/basic_functions.c:1.927 Thu Aug 21 23:37:40 2008 +++ php-src/ext/standard/basic_functions.c Fri Aug 22 15:51:50 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.927 2008/08/21 23:37:40 pajoye Exp $ */ +/* $Id: basic_functions.c,v 1.928 2008/08/22 15:51:50 felipe Exp $ */ #include "php.h" #include "php_streams.h" @@ -4945,7 +4945,7 @@ } 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; http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.317&r2=1.318&diff_format=u Index: php-src/ext/reflection/php_reflection.c diff -u php-src/ext/reflection/php_reflection.c:1.317 php-src/ext/reflection/php_reflection.c:1.318 --- php-src/ext/reflection/php_reflection.c:1.317 Mon Aug 18 19:42:38 2008 +++ php-src/ext/reflection/php_reflection.c Fri Aug 22 15:51:50 2008 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_reflection.c,v 1.317 2008/08/18 19:42:38 felipe Exp $ */ +/* $Id: php_reflection.c,v 1.318 2008/08/22 15:51:50 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1035,7 +1035,7 @@ 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 @@ 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 @@ 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 @@ 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); } /* }}} */ @@ -5416,7 +5416,7 @@ php_info_print_table_start(); php_info_print_table_header(2, "Reflection", "enabled"); - php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.317 2008/08/18 19:42:38 felipe Exp $"); + php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.318 2008/08/22 15:51:50 felipe Exp $"); php_info_print_table_end(); } /* }}} */