com php-src: fix return of hash num elements: Zend/zend_hash .c Zend/zend_hash.h

Commit: d55c85d795d52ff8dfbd5903ea7810583b857864 Author: Anatol Belski <ab@php.net> Sun, 9 Feb 2014 14:29:10 +0100 Parents: 33b5108a2bdc95b93a0c18577999d117448d522b Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d55c85d795d52ff8dfbd5903ea7810583b857864 Log: fix return of hash num elements 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 357b0b2...241431d 100644 --- a/Zend/zend_hash.c +++ b/Zend/zend_hash.c @@ -991,7 +991,7 @@ ZEND_API int zend_hash_index_exists(const HashTable *ht, zend_uint_t h) } -ZEND_API int zend_hash_num_elements(const HashTable *ht) +ZEND_API zend_uint_t zend_hash_num_elements(const HashTable *ht) { IS_CONSISTENT(ht); @@ -1440,7 +1440,7 @@ ZEND_API int zend_hash_sort(HashTable *ht, sort_func_t sort_func, ZEND_API int zend_hash_compare(HashTable *ht1, HashTable *ht2, compare_func_t compar, zend_bool ordered TSRMLS_DC) { Bucket *p1, *p2 = NULL; - int result; + ptrdiff_t result; void *pData2; IS_CONSISTENT(ht1); diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h index a973934..22989a0 100644 --- a/Zend/zend_hash.h +++ b/Zend/zend_hash.h @@ -224,7 +224,7 @@ ZEND_API int zend_hash_minmax(const HashTable *ht, compare_func_t compar, int fl #define zend_hash_merge(target, source, pCopyConstructor, tmp, size, overwrite) \ _zend_hash_merge(target, source, pCopyConstructor, tmp, size, overwrite ZEND_FILE_LINE_CC) -ZEND_API int zend_hash_num_elements(const HashTable *ht); +ZEND_API zend_uint_t zend_hash_num_elements(const HashTable *ht); ZEND_API int zend_hash_rehash(HashTable *ht); @@ -263,7 +263,7 @@ ZEND_API int zend_hash_rehash(HashTable *ht); static inline zend_uint_t zend_inline_hash_func(const char *arKey, zend_size_t nKeyLength) { - register zend_uint_t hash = 5381; + register zend_uint_t hash = Z_UI(5381); /* variant with the hash unrolled eight times */ for (; nKeyLength >= 8; nKeyLength -= 8) {