summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierrick Charron <pierrick@php.net>2012-12-25 20:59:20 -0500
committerPierrick Charron <pierrick@php.net>2012-12-25 20:59:20 -0500
commit5a97c30efe6064692f3d5c33f212e3b96c9228da (patch)
tree680d562d08dae913d113c8a99396a327474fcb45
parent8e6bf9e5e55b05842c06ae459078293d1a97d431 (diff)
parentc12ab5c306172fba153ba228586d0a6f2a470f2b (diff)
downloadphp-git-5a97c30efe6064692f3d5c33f212e3b96c9228da.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: Remove a useless memory write in zend_llist_del_element
-rw-r--r--Zend/zend_llist.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/Zend/zend_llist.c b/Zend/zend_llist.c
index 4656420781..26baf4d958 100644
--- a/Zend/zend_llist.c
+++ b/Zend/zend_llist.c
@@ -91,15 +91,13 @@ 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 = next;
+ current = current->next;
}
}