com php-src: joined identical conditional blocks: Zend/zend_h ash.c
| From: | Anatol Belski | Date: | Tue, 18 Nov 2014 12:19:46 +0000 |
| Subject: | com php-src: joined identical conditional blocks: Zend/zend_h ash.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83131@lists.php.net to get a copy of this message | ||
Commit: 6b3b4fc94497f8e468821e1a3108916cc83c15cf
Author: Anatol Belski <ab@php.net> Sat, 15 Nov 2014 13:12:25 +0100
Parents: 43a02fc31d58b5e4d1a52b1b68ddbec37200948d
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6b3b4fc94497f8e468821e1a3108916cc83c15cf
Log:
joined identical conditional blocks
Changed paths:
M Zend/zend_hash.c
Diff:
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index 5577194..24be94f 100644
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -1697,8 +1697,7 @@ ZEND_API int zend_hash_sort(HashTable *ht, sort_func_t sort_func,
p->key = NULL;
}
}
- }
- if (renumber) {
+
ht->nNextFreeElement = i;
}
if (ht->u.flags & HASH_FLAG_PACKED) {