Revert "Remove a useless memory write in zend_llist_del_element"

adoy · adoy · commit b35ffdeae10e · 2012-12-26T10:13:56.000-05:00
This reverts commit fad960a as required by Stas and Christopher
diff --git a/Zend/zend_llist.c b/Zend/zend_llist.c
@@ -91,13 +91,15 @@ ZEND_API void zend_llist_prepend_element(zend_llist *l, void *element)
 ZEND_API void zend_llist_del_element(zend_llist *l, void *element, int (*compare)(void *element1, void *element2))
 {
 	zend_llist_element *current=l->head;
+	zend_llist_element *next;
 
 	while (current) {
+		next = current->next;
 		if (compare(current->data, element)) {
 			DEL_LLIST_ELEMENT(current, l);
 			break;
 		}
-		current = current->next;
+		current = next;
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -91,13 +91,15 @@ ZEND_API void zend_llist_prepend_element(zend_llist l, void element)`
`91`	`91`	`ZEND_API void zend_llist_del_element(zend_llist l, void element, int (compare)(void element1, void *element2))`
`92`	`92`	`{`
`93`	`93`	`zend_llist_element *current=l->head;`
	`94`	`+ zend_llist_element *next;`
`94`	`95`
`95`	`96`	`while (current) {`
	`97`	`+ next = current->next;`
`96`	`98`	`if (compare(current->data, element)) {`
`97`	`99`	`DEL_LLIST_ELEMENT(current, l);`
`98`	`100`	`break;`
`99`	`101`	`}`
`100`		`- current = current->next;`
	`102`	`+ current = next;`
`101`	`103`	`}`
`102`	`104`	`}`
`103`	`105`