Use new macros

5 files changed, 9 insertions, 9 deletions

diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index ffb78c343e..c7d12bf128 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 a452b631f3..4d6a8ff2fb 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 a919d4bb5e..5f6d43990d 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 536771c53d..311f4f272d 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 bbb145668a..c04307f1c9 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);