com php-src: fix prototype: Zend/zend_hash.c Zend/zend_ hash.h

Commit: 9112c2f122c61f3e9629516e8d86c39e610d184a Author: Anatol Belski <ab@php.net> Thu, 10 Apr 2014 11:44:28 +0200 Parents: af53cc6799221ac1ef48d028c5098838f445afd4 Branches: str_size_and_int64_56_backport Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9112c2f122c61f3e9629516e8d86c39e610d184a Log: fix prototype Changed paths: M Zend/zend_hash.c M Zend/zend_hash.h Diff: diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c index 558fbe8..9ed66f8 100644 --- a/Zend/zend_hash.c +++ b/Zend/zend_hash.c @@ -1294,9 +1294,9 @@ ZEND_API int zend_hash_update_current_key_ex(HashTable *ht, int key_type, const * are inserted in their place. The removed elements can be optionally collected into a hashtable. * This operation reindexes the hashtable, i.e. integer keys will be zero-based and sequential, * while string keys stay intact. The same applies to the elements inserted into the removed HT. */ -ZEND_API void _zend_hash_splice(HashTable *ht, uint nDataSize, copy_ctor_func_t pCopyConstructor, uint offset, uint length, void **list, uint list_count, HashTable *removed ZEND_FILE_LINE_DC) /* {{{ */ +ZEND_API void _zend_hash_splice(HashTable *ht, zend_uint_t nDataSize, copy_ctor_func_t pCopyConstructor, zend_uint_t offset, zend_size_t length, void **list, zend_size_t list_count, HashTable *removed ZEND_FILE_LINE_DC) /* {{{ */ { - int pos; + zend_size_t pos; Bucket *p; IS_CONSISTENT(ht); @@ -1332,7 +1332,7 @@ ZEND_API void _zend_hash_splice(HashTable *ht, uint nDataSize, copy_ctor_func_t } if (list != NULL) { - int i; + zend_size_t i; for (i = 0; i < list_count; i++) { /* Add new element only to the global linked list, not the bucket list. * Also use key 0 for everything, as we'll reindex the hashtable anyways. */ diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h index 08fccab..5a39ad3 100644 --- a/Zend/zend_hash.h +++ b/Zend/zend_hash.h @@ -229,7 +229,7 @@ ZEND_API zend_uint_t zend_hash_num_elements(const HashTable *ht); ZEND_API int zend_hash_rehash(HashTable *ht); ZEND_API void zend_hash_reindex(HashTable *ht, zend_bool only_integer_keys); -ZEND_API void _zend_hash_splice(HashTable *ht, uint nDataSize, copy_ctor_func_t pCopyConstructor, uint offset, uint length, void **list, uint list_count, HashTable *removed ZEND_FILE_LINE_DC); +ZEND_API void _zend_hash_splice(HashTable *ht, zend_uint_t nDataSize, copy_ctor_func_t pCopyConstructor, zend_uint_t offset, zend_size_t length, void **list, zend_size_t list_count, HashTable *removed ZEND_FILE_LINE_DC); #define zend_hash_splice(ht, nDataSize, pCopyConstructor, offset, length, list, list_count, removed) \ _zend_hash_splice(ht, nDataSize, pCopyConstructor, offset, length, list, list_count, removed ZEND_FILE_LINE_CC)