com php-src: Use new macros: Zend/zend_builtin_functions. c ext/soap/soap.c ext/spl/spl_array.c ext/standard/ array.c ext/standard/browscap.c

Commit: f23f7dfed03e67c9b5cca076e24ccf9f7c761674 Author: Xinchen Hui <laruence@php.net> Wed, 8 Apr 2015 14:30:47 +0800 Parents: 54e8c91614a682a75256a61fed7f1c3b324e9e12 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f23f7dfed03e67c9b5cca076e24ccf9f7c761674 Log: Use new macros Changed paths: M Zend/zend_builtin_functions.c M ext/soap/soap.c M ext/spl/spl_array.c M ext/standard/array.c M ext/standard/browscap.c Diff: diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index ffb78c3..c7d12bf 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1144,7 +1144,7 @@ ZEND_FUNCTION(get_object_vars) if (!zobj->ce->default_properties_count && properties == zobj->properties) { /* fast copy */ - ZVAL_ARR(return_value, zend_array_dup(properties)); + RETURN_ARR(zend_array_dup(properties)); } else { array_init_size(return_value, zend_hash_num_elements(properties)); @@ -1902,7 +1902,7 @@ ZEND_FUNCTION(get_defined_vars) { zend_array *symbol_table = zend_rebuild_symbol_table(); - ZVAL_ARR(return_value, zend_array_dup(symbol_table)); + RETURN_ARR(zend_array_dup(symbol_table)); } /* }}} */ diff --git a/ext/soap/soap.c b/ext/soap/soap.c index a452b63..4d6a8ff 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -3182,7 +3182,7 @@ PHP_METHOD(SoapClient, __getCookies) if ((cookies = zend_hash_str_find(Z_OBJPROP_P(getThis()), "_cookies", sizeof("_cookies")-1)) != NULL && Z_TYPE_P(cookies) == IS_ARRAY) { - ZVAL_ARR(return_value, zend_array_dup(Z_ARRVAL_P(cookies))); + RETURN_ARR(zend_array_dup(Z_ARRVAL_P(cookies))); } else { array_init(return_value); } diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c index a919d4b..5f6d439 100644 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@ -825,7 +825,7 @@ SPL_METHOD(Array, getArrayCopy) zval *object = getThis(); spl_array_object *intern = Z_SPLARRAY_P(object); - ZVAL_ARR(return_value, zend_array_dup(spl_array_get_hash_table(intern, 0))); + RETURN_ARR(zend_array_dup(spl_array_get_hash_table(intern, 0))); } /* }}} */ static HashTable *spl_array_get_properties(zval *object) /* {{{ */ @@ -1317,7 +1317,7 @@ SPL_METHOD(Array, exchangeArray) zval *object = getThis(), *array; spl_array_object *intern = Z_SPLARRAY_P(object); - ZVAL_ARR(return_value, zend_array_dup(spl_array_get_hash_table(intern, 0))); + RETVAL_ARR(zend_array_dup(spl_array_get_hash_table(intern, 0))); if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &array) == FAILURE) { return; } diff --git a/ext/standard/array.c b/ext/standard/array.c index 536771c...311f4f2 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -3313,7 +3313,7 @@ PHP_FUNCTION(array_unique) php_set_compare_func(sort_type); - ZVAL_ARR(return_value, zend_array_dup(Z_ARRVAL_P(array))); + RETVAL_ARR(zend_array_dup(Z_ARRVAL_P(array))); if (Z_ARRVAL_P(array)->nNumOfElements <= 1) { /* nothing to do */ return; @@ -3668,7 +3668,7 @@ static void php_array_intersect(INTERNAL_FUNCTION_PARAMETERS, int behavior, int } /* copy the argument array */ - ZVAL_ARR(return_value, zend_array_dup(Z_ARRVAL(args[0]))); + RETVAL_ARR(zend_array_dup(Z_ARRVAL(args[0]))); /* go through the lists and look for common values */ while (Z_TYPE(ptrs[0]->val) != IS_UNDEF) { @@ -4087,7 +4087,7 @@ static void php_array_diff(INTERNAL_FUNCTION_PARAMETERS, int behavior, int data_ } /* copy the argument array */ - ZVAL_ARR(return_value, zend_array_dup(Z_ARRVAL(args[0]))); + RETVAL_ARR(zend_array_dup(Z_ARRVAL(args[0]))); /* go through the lists and look for values of ptr[0] that are not in the others */ while (Z_TYPE(ptrs[0]->val) != IS_UNDEF) { diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c index bbb1456..c04307f 100644 --- a/ext/standard/browscap.c +++ b/ext/standard/browscap..c @@ -488,7 +488,7 @@ PHP_FUNCTION(get_browser) } if (return_array) { - ZVAL_ARR(return_value, zend_array_dup(Z_ARRVAL_P(agent))); + RETVAL_ARR(zend_array_dup(Z_ARRVAL_P(agent))); } else { object_init(return_value);