]> granicus.if.org Git - php/commitdiff
- WS/CS
authorMarcus Boerger <helly@php.net>
Sat, 4 Mar 2006 16:45:45 +0000 (16:45 +0000)
committerMarcus Boerger <helly@php.net>
Sat, 4 Mar 2006 16:45:45 +0000 (16:45 +0000)
ext/spl/spl_array.c

index f1e30b9c940dc196753bd73bec3f89a5274fa784..e01b61faf8f560358d4d4acfc2dd8f0978a93c32 100755 (executable)
@@ -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;