felipe Fri Aug 22 15:54:22 2008 UTC
Modified files: (Branch: PHP_5_3)
/ZendEngine2 zend_compile.c
/php-src/ext/reflection php_reflection.c
Log:
- MFH: Removed unused arguments
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.c?r1=1.647.2.27.2.41.2.82&r2=1.647.2.27.2.41.2.83&diff_format=u
Index: ZendEngine2/zend_compile.c
diff -u ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.82
ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.83
--- ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.82 Tue Aug 12 17:20:24 2008
+++ ZendEngine2/zend_compile.c Fri Aug 22 15:54:20 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_compile.c,v 1.647.2.27.2.41.2.82 2008/08/12 17:20:24 felipe Exp $
*/
+/* $Id: zend_compile.c,v 1.647.2.27.2.41.2.83 2008/08/22 15:54:20 felipe Exp $
*/
#include <zend_language_parser.h>
#include "zend.h"
@@ -2790,7 +2790,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/reflection/php_reflection.c?r1=1.164.2.33.2.45.2.33&r2=1.164.2.33.2.45.2.34&diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.33
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.34
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.33 Mon Aug
11 22:31:21 2008
+++ php-src/ext/reflection/php_reflection.c Fri Aug 22 15:54:21 2008
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.33 2008/08/11 22:31:21 cseiler
Exp $ */
+/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.34 2008/08/22 15:54:21 felipe Exp
$ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1010,7 +1010,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);
@@ -1047,7 +1047,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);
@@ -4648,7 +4648,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);
}
/* }}} */
@@ -4663,7 +4663,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);
}
/* }}} */
@@ -5242,7 +5242,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.164.2.33.2.45.2.33 2008/08/11 22:31:21 cseiler Exp $");
+ php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v
1.164.2.33.2.45.2.34 2008/08/22 15:54:21 felipe Exp $");
php_info_print_table_end();
} /* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
