From: Etienne Kneuss <colder@php.net>
Date: Sun, 10 Feb 2008 14:07:40 +0000 (+0000)
Subject: Cosmetics, move stuff around, ws
X-Git-Tag: RELEASE_2_0_0a1~548
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e370d5bccc929fd28677fa5cb025d060792a48b8;p=php

Cosmetics, move stuff around, ws
---

diff --git a/ext/spl/spl_dllist.c b/ext/spl/spl_dllist.c
index f498dec164..c25112d4ff 100644
--- a/ext/spl/spl_dllist.c
+++ b/ext/spl/spl_dllist.c
@@ -314,25 +314,6 @@ static void *spl_ptr_llist_shift(spl_ptr_llist *llist) /* {{{ */
 }
 /* }}} */
 
-static void spl_dllist_object_free_storage(void *object TSRMLS_DC) /* {{{ */
-{
-	spl_dllist_object *intern = (spl_dllist_object *)object;
-	zval              *tmp    = NULL;
-
-	zend_object_std_dtor(&intern->std TSRMLS_CC);
-
-	while(intern->llist->count > 0) {
-		tmp = (zval *)spl_ptr_llist_pop(intern->llist);
-		zval_ptr_dtor(&tmp);
-	}
-
-	spl_ptr_llist_destroy(intern->llist);
-	zval_ptr_dtor(&intern->retval);
-
-	efree(object);
-}
-/* }}} */
-
 static void spl_ptr_llist_copy(spl_ptr_llist *from, spl_ptr_llist *to) /* {{{ */
 {
 	spl_ptr_llist_element   *current = from->head, *next;
@@ -356,6 +337,25 @@ static void spl_ptr_llist_copy(spl_ptr_llist *from, spl_ptr_llist *to) /* {{{ */
 
 zend_object_iterator *spl_dllist_get_iterator(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC);
 
+static void spl_dllist_object_free_storage(void *object TSRMLS_DC) /* {{{ */
+{
+	spl_dllist_object *intern = (spl_dllist_object *)object;
+	zval              *tmp    = NULL;
+
+	zend_object_std_dtor(&intern->std TSRMLS_CC);
+
+	while(intern->llist->count > 0) {
+		tmp = (zval *)spl_ptr_llist_pop(intern->llist);
+		zval_ptr_dtor(&tmp);
+	}
+
+	spl_ptr_llist_destroy(intern->llist);
+	zval_ptr_dtor(&intern->retval);
+
+	efree(object);
+}
+/* }}} */
+
 static zend_object_value spl_dllist_object_new_ex(zend_class_entry *class_type, spl_dllist_object **obj, zval *orig, int clone_orig TSRMLS_DC) /* {{{ */
 {
 	zend_object_value  retval;
@@ -1056,13 +1056,13 @@ zend_object_iterator *spl_dllist_get_iterator(zend_class_entry *ce, zval *object
 		return NULL;
 	}
 
-	iterator     = emalloc(sizeof(spl_dllist_it));
-
 	Z_ADDREF_P(object);
-	iterator->intern.it.data = (void*)object;
-	iterator->intern.it.funcs = &spl_dllist_it_funcs;
-	iterator->intern.ce = ce;
-	iterator->intern.value = NULL;
+
+	iterator                     = emalloc(sizeof(spl_dllist_it));
+	iterator->intern.it.data     = (void*)object;
+	iterator->intern.it.funcs    = &spl_dllist_it_funcs;
+	iterator->intern.ce          = ce;
+	iterator->intern.value       = NULL;
 	iterator->traverse_position  = dllist_object->traverse_position;
 	iterator->traverse_pointer   = dllist_object->traverse_pointer;
 	iterator->flags              = dllist_object->flags & SPL_DLLIST_IT_MASK;