com php-src: cleanup: Zend/zend_builtin_functions.c

From: Date: Mon, 02 Jun 2014 22:43:31 +0000
Subject: com php-src: cleanup: Zend/zend_builtin_functions.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-78658@lists.php.net to get a copy of this message
Commit: 2bc1abe204dd615c87511d8f425467a4af6e345f Author: Dmitry Stogov <dmitry@zend.com> Tue, 3 Jun 2014 02:43:31 +0400 Parents: 0427ae08fb8dde00993277c3e7f9d98abfa159a8 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2bc1abe204dd615c87511d8f425467a4af6e345f Log: cleanup Changed paths: M Zend/zend_builtin_functions.c Diff: diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 1483670..d580994 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1908,7 +1908,7 @@ ZEND_FUNCTION(get_defined_constants) if (categorize) { zend_constant *val; int module_number; - zval *modules, tmp, *const_val; + zval *modules, const_val; char **module_names; zend_module_entry *module; int i = 1; @@ -1943,14 +1943,8 @@ ZEND_FUNCTION(get_defined_constants) add_assoc_zval(return_value, module_names[module_number], &modules[module_number]); } - if (EXPECTED(!Z_COPYABLE(val->value))) { - const_val = &val->value; - } else { - ZVAL_DUP(&tmp, &val->value); - const_val = &tmp; - } - - zend_hash_add_new(Z_ARRVAL(modules[module_number]), val->name, const_val); + ZVAL_DUP(&const_val, &val->value); + zend_hash_add_new(Z_ARRVAL(modules[module_number]), val->name, &const_val); } ZEND_HASH_FOREACH_END(); efree(module_names);

« previous php.cvs (#78658) next »