- Optimize zend_hash_del a tiny bit.

diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index 225e1adf0e6a6b91835bc31a12dc2befb1abe2e3..674c8b39110f6db016107bdfdb051267b5de98d3 100644 (file)
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -538,7 +538,7 @@ ZEND_API int zend_hash_rehash(HashTable *ht)
 ZEND_API int zend_hash_del_key_or_index(HashTable *ht, char *arKey, uint nKeyLength, ulong h, int flag)
 {
        uint nIndex;
-       Bucket *p, *t = NULL;           /* initialize just to shut gcc up with -Wall */
+       Bucket *p;
 
        IS_CONSISTENT(ht);
 
@@ -556,7 +556,7 @@ ZEND_API int zend_hash_del_key_or_index(HashTable *ht, char *arKey, uint nKeyLen
                        if (p == ht->arBuckets[nIndex]) {
                                ht->arBuckets[nIndex] = p->pNext;
                        } else {
-                               t->pNext = p->pNext;
+                               p->pLast->pNext = p->pNext;
                        }
                        if (p->pNext) {
                                p->pNext->pLast = p->pLast;
@@ -586,7 +586,6 @@ ZEND_API int zend_hash_del_key_or_index(HashTable *ht, char *arKey, uint nKeyLen
                        ht->nNumOfElements--;
                        return SUCCESS;
                }
-               t = p;
                p = p->pNext;
        }
        return FAILURE;