From: Marcus Boerger Date: Sat, 4 Mar 2006 16:45:45 +0000 (+0000) Subject: - WS/CS X-Git-Tag: RELEASE_1_3~554 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aae51ab2edef4bc969902feba91c547e06d4bd2f;p=php - WS/CS --- diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c index f1e30b9c94..e01b61faf8 100755 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@ -900,7 +900,7 @@ SPL_METHOD(Array, __construct) return; } } - + spl_array_rewind(intern TSRMLS_CC); php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC); @@ -975,15 +975,14 @@ SPL_METHOD(Array, exchangeArray) { zval *object = getThis(), *tmp, **array; spl_array_object *intern = (spl_array_object*)zend_object_store_get_object(object TSRMLS_CC); - - array_init(return_value); + + array_init(return_value); zend_hash_copy(HASH_OF(return_value), spl_array_get_hash_table(intern, 0 TSRMLS_CC), (copy_ctor_func_t) zval_add_ref, &tmp, sizeof(zval*)); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &array) == FAILURE) { WRONG_PARAM_COUNT; } - if (Z_TYPE_PP(array) == IS_OBJECT && intern == (spl_array_object*)zend_object_store_get_object(object TSRMLS_CC)) - { + if (Z_TYPE_PP(array) == IS_OBJECT && intern == (spl_array_object*)zend_object_store_get_object(object TSRMLS_CC)) { zval_ptr_dtor(&intern->array); array = &object; intern->array = object;