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

From: Date: Tue, 20 Jan 2015 05:55:36 +0000
Subject: com php-src: cleanup: Zend/zend_builtin_functions.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-84197@lists.php.net to get a copy of this message
Commit: 8dc3c283b892e17f83a5f98310a6955fcbda6fb6 Author: Dmitry Stogov <dmitry@zend.com> Tue, 20 Jan 2015 08:55:36 +0300 Parents: 6f67d5ad6e81d2763af320240ed88db3a981fdca Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8dc3c283b892e17f83a5f98310a6955fcbda6fb6 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 161bfb2..6b73bf3 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -475,21 +475,13 @@ ZEND_FUNCTION(func_get_args) ZEND_HASH_FILL_PACKED(Z_ARRVAL_P(return_value)) { i = 0; p = ZEND_CALL_ARG(ex, 1); - if (ZEND_CALL_NUM_ARGS(ex) > first_extra_arg) { + if (arg_count > first_extra_arg) { while (i < first_extra_arg) { q = p; ZVAL_DEREF(q); if (Z_OPT_REFCOUNTED_P(q)) Z_ADDREF_P(q); ZEND_HASH_FILL_ADD(q); -// q->h = i; -// q->key = NULL; -// if (!Z_ISREF_P(p)) { -// ZVAL_COPY(&q->val, p); -// } else { -// ZVAL_COPY(&q->val, Z_REFVAL_P(p)); -// } p++; -// q++; i++; } p = ZEND_CALL_VAR_NUM(ex, ex->func->op_array.last_var + ex->func->op_array.T); @@ -499,15 +491,7 @@ ZEND_FUNCTION(func_get_args) ZVAL_DEREF(q); if (Z_OPT_REFCOUNTED_P(q)) Z_ADDREF_P(q); ZEND_HASH_FILL_ADD(q); -// q->h = i; -// q->key = NULL; -// if (!Z_ISREF_P(p)) { -// ZVAL_COPY(&q->val, p); -// } else { -// ZVAL_COPY(&q->val, Z_REFVAL_P(p)); -// } p++; -// q++; i++; } } ZEND_HASH_FILL_END();

« previous php.cvs (#84197) next »